From: Miles Bader <miles@gnu.org>
Date: Tue, 21 Aug 2007 04:54:03 +0000 (+0000)
Subject: Merge from emacs--devo--0
X-Git-Tag: emacs-pretest-23.0.90~8295^2~349
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/42216a6b65dabb543156bc5e52cbf89d8ce96cb9

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 852-856)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 93-96)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 245)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-249
---

42216a6b65dabb543156bc5e52cbf89d8ce96cb9
diff --cc lisp/Makefile.in
index 69efa57a2f,7cd947dc92..a00b482a94
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@@ -92,12 -90,12 +92,12 @@@ $(lisp)/cus-load.el
  custom-deps: $(lisp)/subdirs.el $(lisp)/loaddefs.el $(lisp)/cus-load.el doit
  	wd=$(lisp); $(setwins_almost); \
  	echo Directories: $$wins; \
- 	LC_ALL=C $(EMACS) $(EMACSOPT) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins
 -	$(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins
++	LC_ALL=C $(emacs) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins
  
  finder-data: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit
  	wd=$(lisp); $(setwins_almost); \
  	echo Directories: $$wins; \
- 	LC_ALL=C $(EMACS) $(EMACSOPT) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins
 -	$(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins
++	LC_ALL=C $(emacs) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins
  
  $(lisp)/loaddefs.el:
  	echo ";;; loaddefs.el --- automatically extracted autoloads" >> $@
@@@ -112,7 -110,7 +112,7 @@@
  autoloads: $(lisp)/subdirs.el $(lisp)/loaddefs.el doit
  	wd=$(lisp); $(setwins_almost); \
  	echo Directories: $$wins; \
- 	LC_ALL=C $(EMACS) $(EMACSOPT) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
 -	$(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
++	LC_ALL=C $(emacs) -l autoload --eval '(setq generated-autoload-file "$(lisp)/loaddefs.el")' -f batch-update-autoloads $$wins
  
  $(lisp)/subdirs.el:
  	$(MAKE) $(MFLAGS) update-subdirs
@@@ -212,7 -210,7 +212,7 @@@ compile-after-backup: backup-compiled-f
  # new ones.
  
  recompile: doit mh-autoloads $(lisp)/progmodes/cc-mode.elc
- 	LC_ALL=C $(EMACS) $(EMACSOPT) --eval "(batch-byte-recompile-directory 0)" $(lisp)
 -	$(emacs) --eval "(batch-byte-recompile-directory 0)" $(lisp)
++	LC_ALL=C $(emacs) --eval "(batch-byte-recompile-directory 0)" $(lisp)
  
  # CC Mode uses a compile time macro system which causes a compile time
  # dependency in cc-mode.elc on the macros in cc-langs.el and the
diff --cc lisp/startup.el
index 3430e58830,53f120b015..5bf85a169e
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@@ -1270,22 -1297,13 +1298,16 @@@ where FACE is a valid face specificatio
  		   (eq (frame-parameter nil 'background-mode) 'dark))
  	  (setq img (append img '(:color-symbols (("#000000" . "gray30"))))))
  
- 	;; Insert the image with a help-echo and a keymap.
- 	(let ((map (make-sparse-keymap))
- 	      (help-echo "mouse-2: browse http://www.gnu.org/"))
- 	  (define-key map [mouse-2]
- 	    (lambda ()
- 	      (interactive)
- 	      (browse-url "http://www.gnu.org/")
- 	      (throw 'exit nil)))
- 	  (define-key map [down-mouse-2] 'ignore)
- 	  (define-key map [up-mouse-2] 'ignore)
- 	  (insert-image img (propertize "xxx" 'help-echo help-echo
- 					'keymap map)))
+ 	;; Insert the image with a help-echo and a link.
+ 	(make-button (prog1 (point) (insert-image img)) (point)
+ 		     'face 'default
+ 		     'help-echo "mouse-2: browse http://www.gnu.org/"
+ 		     'action (lambda (button) (browse-url "http://www.gnu.org/"))
+ 		     'follow-link t)
  	(insert "\n"))))
 +  (fancy-splash-insert
 +   :face '(variable-pitch :background "red")
 +   "\n!! This version is ALPHA status.  It may lose your data!!\n\n")
    (fancy-splash-insert
     :face '(variable-pitch :foreground "red")
     (if (eq system-type 'gnu/linux)