Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-966

18 files changed, 192 insertions, 72 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7caab1fc466..37fe9fa861e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,72 @@
+2007-12-29  Richard Stallman  <rms@gnu.org>
+
+        * progmodes/compile.el (compilation-start): Set initial visible
+        point properly even when compilation buffer already current.
+
+2007-12-29  Richard Stallman  <rms@gnu.org>
+
+        * files.el (conf-mode-maybe): New function.
+        (auto-mode-alist): Use conf-mode-maybe for .conf etc.
+
+2007-12-29  Martin Rudalics  <rudalics@gmx.at>
+
+        * textmodes/fill.el (fill-find-break-point): Fix doc-string typo.
+
+2007-12-29  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * progmodes/asm-mode.el (asm-mode-map): Add a major mode menu.
+
+2007-12-29  Richard Stallman  <rms@gnu.org>
+
+        * comint.el (comint-mode-map): Explicitly bind `delete' and `kp-delete'
+        so they never do EOF.
+
+2007-12-29  Richard Stallman  <rms@gnu.org>
+
+        * faces.el (copy-face): Create the new face explicitly if it
+        does not exist already.
+
+2007-12-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (minibuffer-history, shell-command-history)
+        (set-variable-value-history):
+        * replace.el (regexp-history):
+        * international/mule-cmds.el (input-method-history):
+        * files.el (file-name-history): Add reference to history-length in
+        the doc string.
+
+2007-12-29  Richard Stallman  <rms@gnu.org>
+
+        * comint.el (comint-password-prompt-regexp): Match `Enter Password'.
+
+2007-12-29  Jason Rumney  <jasonr@gnu.org>
+
+        * find-dired.el (find-name-arg): New custom variable.
+        (find-name-dired): Use it.
+        (find-dired-find-program): Remove.
+        (find-dired): Use find-program.
+        (find-grep-dired): Use grep-program.
+
+        * progmodes/grep.el (rgrep): Use find-name-arg.
+
+2007-12-29  Thien-Thi Nguyen  <ttn@gnuvola.org>
+
+        * progmodes/cc-vars.el (defcustom-c-stylevar):
+        Revert to pre-2007-12-12 version.
+
+2007-12-29  Richard Stallman  <rms@gnu.org>
+
+        * emacs-lisp/find-func.el (find-function-after-hook): Add :type.
+
+        * info.el (Info-clone-buffer): Renamed from Info-clone-buffer-hook.
+        Use changed.
+
+        * startup.el (fancy-splash-help-echo): Var deleted.
+        (fancy-splash-insert): Get help-echo from (startup-echo-area-message).
+        (fancy-about-screen): Don't display fancy-splash-help-echo.
+
+        * menu-bar.el (menu-bar-describe-menu): Remove dots from menu text.
+
 2007-12-28  Eric S. Raymond  <esr@snark.thyrsus.com>
 
         * vc-hooks.el, vc.el: Move vc-directory-exclusion-list from vc.el
diff --git a/lisp/comint.el b/lisp/comint.el
index f1d9243cc60..94b1842fb1c 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -336,8 +336,9 @@ This variable is buffer-local."
 ;; plink prints a prompt like `Passphrase for key "root@GNU.ORG": '.
 ;; Ubuntu's sudo prompts like `[sudo] password for user:'
 ;; Some implementations of passwd use "Password (again)" as the 2nd prompt.
+;; Something called "perforce" uses "Enter password:".
 (defcustom comint-password-prompt-regexp
-  "\\(\\([Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
+  "\\(\\(Enter \\|[Oo]ld \\|[Nn]ew \\|'s \\|login \\|\
 Kerberos \\|CVS \\|UNIX \\| SMB \\|LDAP \\|\\[sudo] \\|^\\)\
 \[Pp]assword\\( (again)\\)?\\|\
 pass phrase\\|\\(Enter \\|Repeat \\|Bad \\)?[Pp]assphrase\\)\
@@ -452,6 +453,10 @@ executed once when the buffer is created."
     (define-key map "\e\C-l"      'comint-show-output)
     (define-key map "\C-m"        'comint-send-input)
     (define-key map "\C-d"        'comint-delchar-or-maybe-eof)
+    ;; The following two are standardly aliased to C-d,
+    ;; but they should never do EOF, just delete.
+    (define-key map [delete]      'delete-char)
+    (define-key map [kp-delete]   'delete-char)
     (define-key map "\C-c "       'comint-accumulate)
     (define-key map "\C-c\C-x"    'comint-get-next-from-history)
     (define-key map "\C-c\C-a"    'comint-bol-or-process-mark)
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 24e26827f7c..4aa4590371a 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -133,6 +133,7 @@ See `find-function' and `find-variable'."
   "Hook run after finding symbol definition.
 
 See the functions `find-function' and `find-variable'."
+  :type 'hook
   :group 'find-function
   :version "20.3")
 
diff --git a/lisp/faces.el b/lisp/faces.el
index 88b0c54039a..925b76844e9 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -158,13 +158,18 @@ and for each existing frame.
 
 If the optional fourth argument NEW-FRAME is given,
 copy the information from face OLD-FACE on frame FRAME
-to NEW-FACE on frame NEW-FRAME."
+to NEW-FACE on frame NEW-FRAME.  In this case, FRAME may not be nil."
   (let ((inhibit-quit t))
     (if (null frame)
         (progn
+          (when new-frame
+            (error "Copying face %s from all frames to one frame"
+                   old-face))
+          (make-empty-face new-face)
           (dolist (frame (frame-list))
             (copy-face old-face new-face frame))
           (copy-face old-face new-face t))
+      (make-empty-face new-face)
       (internal-copy-lisp-face old-face new-face frame new-frame))
     new-face))
 
diff --git a/lisp/files.el b/lisp/files.el
index 70a07ea5eff..dec47ce362e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -525,7 +525,10 @@ using \\[toggle-read-only]."
   :group 'view)
 
 (defvar file-name-history nil
-  "History list of file names entered in the minibuffer.")
+  "History list of file names entered in the minibuffer.
+
+Maximum length of the history list is determined by the value
+of `history-length', which see.")
 
 (put 'ange-ftp-completion-hook-function 'safe-magic t)
 (defun ange-ftp-completion-hook-function (op &rest args)
@@ -2092,7 +2095,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
      ("java.+\\.conf\\'" . conf-javaprop-mode)
      ("\\.properties\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-javaprop-mode)
      ;; *.cf, *.cfg, *.conf, *.config[.local|.de_DE.UTF8|...], */config
-     ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-mode)
+     ("[/.]c\\(?:on\\)?f\\(?:i?g\\)?\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-mode-maybe)
      ("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\(?:\\.d/.+\\)?\\|protocols\\|rpc\\|services\\)\\'" . conf-space-mode)
      ("\\`/etc/\\(?:acpid?/.+\\|aliases\\(?:\\.d/.+\\)?\\|default/.+\\|group-?\\|hosts\\..+\\|inittab\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\|sysconfig/.+\\)\\'" . conf-mode)
      ;; ChangeLog.old etc.  Other change-log-mode entries are above;
@@ -2139,6 +2142,16 @@ See also `interpreter-mode-alist', which detects executable script modes
 based on the interpreters they specify to run,
 and `magic-mode-alist', which determines modes based on file contents.")
 
+(defun conf-mode-maybe ()
+  "Select Conf mode or XML mode according to start of file."
+  (if (save-excursion
+        (save-restriction
+          (widen)
+          (goto-char (point-min))
+          (looking-at "<\\?xml \\|<!-- \\|<!DOCTYPE ")))
+      (xml-mode)
+    (conf-mode)))
+
 (defvar interpreter-mode-alist
   ;; Note: The entries for the modes defined in cc-mode.el (awk-mode
   ;; and pike-mode) are added through autoload directives in that
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 0a3de850762..8a8304c6763 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -36,11 +36,6 @@
   :group 'dired
   :prefix "find-")
 
-(defcustom find-dired-find-program "find"
-  "Program used to find files."
-  :group 'dired
-  :type 'file)
-
 ;; find's -ls corresponds to these switches.
 ;; Note -b, at least GNU find quotes spaces etc. in filenames
 ;;;###autoload
@@ -77,6 +72,18 @@ On other systems, the closest you can come is to use `-l'."
   :type 'string
   :group 'find-dired)
 
+;;;###autoload
+(defcustom find-name-arg
+  (if read-file-name-completion-ignore-case
+      "-iname"
+    "-name")
+  "*Argument used to specify file name pattern.
+If `read-file-name-completion-ignore-case' is non-nil, -iname is used so that
+find also ignores case. Otherwise, -name is used."
+  :type 'string
+  :group 'find-dired
+  :version "22.2")
+
 (defvar find-args nil
   "Last arguments given to `find' by \\[find-dired].")
 
@@ -126,7 +133,7 @@ as the final argument."
     (erase-buffer)
     (setq default-directory dir
           find-args args              ; save for next interactive call
-          args (concat find-dired-find-program " . "
+          args (concat find-program " . "
                        (if (string= args "")
                            ""
                          (concat
@@ -198,7 +205,7 @@ The command run (after changing into DIR) is
     find . -name 'PATTERN' -ls"
   (interactive
    "DFind-name (directory): \nsFind-name (filename wildcard): ")
-  (find-dired dir (concat "-name " (shell-quote-argument pattern))))
+  (find-dired dir (concat find-name-arg " " (shell-quote-argument pattern))))
 
 ;; This functionality suggested by
 ;; From: oblanc@watcgl.waterloo.edu (Olivier Blanc)
@@ -222,7 +229,7 @@ Thus ARG can also contain additional grep options."
   ;; by FIFOs and devices.  I'm not sure what's best to do
   ;; about symlinks, so as far as I know this is not wrong.
   (find-dired dir
-              (concat "-type f -exec grep " find-grep-options " -e "
+              (concat "-type f -exec " grep-program " " find-grep-options " -e "
                       (shell-quote-argument regexp)
                       " "
                       (shell-quote-argument "{}")
diff --git a/lisp/info.el b/lisp/info.el
index 2d396a105d8..b842cc2adb6 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3472,7 +3472,7 @@ Advanced commands:
   (setq widen-automatically nil)
   (setq desktop-save-buffer 'Info-desktop-buffer-misc-data)
   (add-hook 'kill-buffer-hook 'Info-kill-buffer nil t)
-  (add-hook 'clone-buffer-hook 'Info-clone-buffer-hook nil t)
+  (add-hook 'clone-buffer-hook 'Info-clone-buffer nil t)
   (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
   (add-hook 'isearch-mode-hook 'Info-isearch-start nil t)
   (set (make-local-variable 'isearch-search-fun-function)
@@ -3495,7 +3495,8 @@ Advanced commands:
        Info-tag-table-buffer
        (kill-buffer Info-tag-table-buffer)))
 
-(defun Info-clone-buffer-hook ()
+;; Placed on `clone-buffer-hook'.
+(defun Info-clone-buffer ()
   (when (bufferp Info-tag-table-buffer)
     (setq Info-tag-table-buffer
           (with-current-buffer Info-tag-table-buffer (clone-buffer))))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index f8dc141943f..ef3d7fbf13e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1339,7 +1339,10 @@ This is the input method activated automatically by the command
 (put 'input-method-function 'permanent-local t)
 
 (defvar input-method-history nil
-  "History list for some commands that read input methods.")
+  "History list of input methods read from the minibuffer.
+
+Maximum length of the history list is determined by the value
+of `history-length', which see.")
 (make-variable-buffer-local 'input-method-history)
 (put 'input-method-history 'permanent-local t)
 
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index b94f3bc8297..a3a9cfc8058 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -327,7 +327,8 @@ Conversion is done based upon the current selected style."
 (defun Footnote-current-regexp ()
   "Return the regexp of the index of the current style."
   (concat (nth 2 (or (assq footnote-style footnote-style-alist)
-                     (nth 0 footnote-style-alist))) "*"))
+                     (nth 0 footnote-style-alist)))
+          "*"))
 
 (defun Footnote-refresh-footnotes (&optional index-regexp)
   "Redraw all footnotes.
@@ -345,7 +346,7 @@ styles."
           (search-backward footnote-start-tag nil t)
           (when (looking-at (concat
                              (regexp-quote footnote-start-tag)
-                             "\\(" index-regexp "\\)"
+                             "\\(" index-regexp "+\\)"
                              (regexp-quote footnote-end-tag)))
             (replace-match (concat
                             footnote-start-tag
@@ -361,7 +362,7 @@ styles."
         (goto-char (cdr alist))
         (when (looking-at (concat
                            (regexp-quote footnote-start-tag)
-                           "\\(" index-regexp "\\)"
+                           "\\(" index-regexp "+\\)"
                            (regexp-quote footnote-end-tag)))
           (replace-match (concat
                           footnote-start-tag
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 2f4c95d6484..7a4233018e9 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1216,7 +1216,7 @@ mail status in mode line"))
               :visible default-enable-multibyte-characters
               :help "Display multilingual environment settings"))
 (define-key menu-bar-describe-menu [describe-coding-system-briefly]
-  '(menu-item "Describe Coding System (Briefly)..."
+  '(menu-item "Describe Coding System (Briefly)"
               describe-current-coding-system-briefly
               :visible default-enable-multibyte-characters))
 (define-key menu-bar-describe-menu [describe-coding-system]
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index d38e6170a23..591adbd4392 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -79,6 +79,14 @@
     (define-key map "\C-c;"     'comment-region)
     (define-key map "\C-j"      'newline-and-indent)
     (define-key map "\C-m"      'newline-and-indent)
+    (define-key map [menu-bar] (make-sparse-keymap))
+    (define-key map [menu-bar asm-mode] (cons "Asm" map))
+    (define-key map [asm-colon]
+      '("Insert Colon" . asm-colon))
+    (define-key map [comment-region]
+      '("Comment Region" . comment-region))
+    (define-key map [newline-and-indent]
+      '("Insert Newline and Indent" . newline-and-indent))
     map)
   "Keymap for Asm mode.")
 
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 6110ab2250f..b1fcdc22241 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -156,44 +156,34 @@ Useful as last item in a `choice' widget."
   (setq c-fallback-style (cons (cons name val) c-fallback-style)))
 
 (defmacro defcustom-c-stylevar (name val doc &rest args)
-  "Define a style variable NAME with VAL and DOC.
-More precisely, convert the given `:type FOO', mined out of ARGS,
-to an aggregate `:type (radio STYLE (PREAMBLE FOO))', append some
-some boilerplate documentation to DOC, arrange for the fallback
-value of NAME to be VAL, and call `custom-declare-variable' to
-do the rest of the work.
-
-STYLE stands for the choice where the value is taken from some
-style setting.  PREAMBLE is optionally prepended to FOO; that is,
-if FOO contains :tag or :value, the respective two-element list
-component is ignored."
-  (declare (debug (symbolp form stringp &rest)))
-  (let* ((expanded-doc (concat doc "
+  "Defines a style variable."
+  `(let ((-value- ,val))
+     (c-set-stylevar-fallback ',name -value-)
+     (custom-declare-variable
+      ',name ''set-from-style
+      ,(concat doc "
 
 This is a style variable.  Apart from the valid values described
-above, it can be set to the symbol `set-from-style'.  In that case,
-it takes its value from the style system (see `c-default-style' and
+above, it can be set to the symbol `set-from-style'.  In that case, it
+takes its value from the style system (see `c-default-style' and
 `c-style-alist') when a CC Mode buffer is initialized.  Otherwise,
 the value set here overrides the style system (there is a variable
-`c-old-style-variable-behavior' that changes this, though)."))
-         (typ (eval (plist-get args :type)))
-         (type (if (consp typ) typ (list typ)))
-         (head (car type))
-         (tail (cdr type))
-         (newt (append (unless (plist-get tail :tag)
-                         '(:tag "Override style settings"))
-                       (unless (plist-get tail :value)
-                         `(:value ,(eval val)))
-                       tail))
-         (aggregate `'(radio
-                       (const :tag "Use style settings" set-from-style)
-                       ,(cons head newt))))
-    `(progn
-       (c-set-stylevar-fallback ',name ,val)
-       (custom-declare-variable
-        ',name ''set-from-style
-        ,expanded-doc
-        ,@(plist-put args :type aggregate)))))
+`c-old-style-variable-behavior' that changes this, though).")
+      ,@(plist-put
+         args ':type
+         `(` (radio
+              (const :tag "Use style settings"
+                     set-from-style)
+              ,(, (let ((type (eval (plist-get args ':type))))
+                    (unless (consp type)
+                      (setq type (list type)))
+                    (unless (c-safe (plist-get (cdr type) ':value))
+                      (setcdr type (append '(:value (, -value-))
+                                           (cdr type))))
+                    (unless (c-safe (plist-get (cdr type) ':tag))
+                      (setcdr type (append '(:tag "Override style settings")
+                                           (cdr type))))
+                    (bq-process type)))))))))
 
 (defun c-valid-offset (offset)
   "Return non-nil if OFFSET is a valid offset for a syntactic symbol.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 9a7b3eb5c08..6781862889c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1163,10 +1163,6 @@ Returns the compilation buffer created."
                 command "\n")
         (setq thisdir default-directory))
       (set-buffer-modified-p nil))
-    ;; If we're already in the compilation buffer, go to the end
-    ;; of the buffer, so point will track the compilation output.
-    (if (eq outbuf (current-buffer))
-        (goto-char (point-max)))
     ;; Pop up the compilation buffer.
     ;; http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01638.html
     (setq outwin (display-buffer outbuf))
@@ -1192,10 +1188,18 @@ Returns the compilation buffer created."
         (set (make-local-variable 'revert-buffer-function)
              'compilation-revert-buffer)
         (set-window-start outwin (point-min))
-        (or (eq outwin (selected-window))
-            (set-window-point outwin (if compilation-scroll-output
-                                         (point)
-                                       (point-min))))
+
+        ;; Position point as the user will see it.
+        (let ((desired-visible-point
+               ;; Put it at the end if `compilation-scroll-output' is set.
+               (if compilation-scroll-output
+                   (point-max)
+                 ;; Normally put it at the top.
+                 (point-min))))
+          (if (eq outwin (selected-window))
+              (goto-char desired-visible-point)
+            (set-window-point outwin desired-visible-point)))
+
         ;; The setup function is called before compilation-set-window-height
         ;; so it can set the compilation-window-height buffer locally.
         (if compilation-process-setup-function
@@ -1219,7 +1223,10 @@ Returns the compilation buffer created."
           (setq mode-line-process '(":%s"))
           (set-process-sentinel proc 'compilation-sentinel)
           (set-process-filter proc 'compilation-filter)
-          (set-marker (process-mark proc) (point) outbuf)
+          ;; Use (point-max) here so that output comes in
+          ;; after the initial text,
+          ;; regardless of where the user sees point.
+          (set-marker (process-mark proc) (point-max) outbuf)
           (when compilation-disable-input
             (condition-case nil
                 (process-send-eof proc)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index f811fce6e7f..062fce4c346 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -839,10 +839,10 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
                       grep-find-template
                       regexp
                       (concat (shell-quote-argument "(")
-                              " -name "
+                              " " find-name-arg " "
                               (mapconcat #'shell-quote-argument
                                          (split-string files)
-                                         " -o -name ")
+                                         (concat " -o " find-name-arg " "))
                               " "
                               (shell-quote-argument ")"))
                        dir
diff --git a/lisp/replace.el b/lisp/replace.el
index 8bd3bec20a0..b76c64085c2 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -519,7 +519,10 @@ which will run faster and will not set the mark or print anything."
 
 
 (defvar regexp-history nil
-  "History list for some commands that read regular expressions.")
+  "History list for some commands that read regular expressions.
+
+Maximum length of the history list is determined by the value
+of `history-length', which see.")
 
 
 (defalias 'delete-non-matching-lines 'keep-lines)
diff --git a/lisp/simple.el b/lisp/simple.el
index 0cbec53fe66..b92967da112 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1166,7 +1166,10 @@ to get different commands to edit and resubmit."
 (defvar minibuffer-history nil
   "Default minibuffer history list.
 This is used for all minibuffer input
-except when an alternate history list is specified.")
+except when an alternate history list is specified.
+
+Maximum length of the history list is determined by the value
+of `history-length', which see.")
 (defvar minibuffer-history-sexp-flag nil
   "Control whether history list elements are expressions or strings.
 If the value of this variable equals current minibuffer depth,
@@ -1901,7 +1904,10 @@ You can disable the popping up of this buffer by adding the entry
     t))
 
 (defvar shell-command-history nil
-  "History list for some commands that read shell commands.")
+  "History list for some commands that read shell commands.
+
+Maximum length of the history list is determined by the value
+of `history-length', which see.")
 
 (defvar shell-command-switch "-c"
   "Switch used to have the shell execute its command line argument.")
@@ -5015,7 +5021,10 @@ Each action has the form (FUNCTION . ARGS)."
                 'switch-to-buffer-other-frame yank-action send-actions))
 
 (defvar set-variable-value-history nil
-  "History of values entered with `set-variable'.")
+  "History of values entered with `set-variable'.
+
+Maximum length of the history list is determined by the value
+of `history-length', which see.")
 
 (defun set-variable (variable value &optional make-local)
   "Set VARIABLE to VALUE.  VALUE is a Lisp object.
diff --git a/lisp/startup.el b/lisp/startup.el
index ee06faea022..1faf63efa78 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1319,8 +1319,6 @@ Each element in the list should be a list of strings or pairs
 
 ;; These are temporary storage areas for the splash screen display.
 
-(defvar fancy-splash-help-echo nil)
-
 (defun fancy-splash-insert (&rest args)
   "Insert text into the current buffer, with faces.
 Arguments from ARGS should be either strings; functions called
@@ -1354,7 +1352,7 @@ a face or button specification."
                                          (funcall it)
                                        it))
                                    'face current-face
-                                   'help-echo fancy-splash-help-echo))))
+                                   'help-echo (startup-echo-area-message)))))
       (setq args (cdr args)))))
 
 
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 5c6638a51e9..54e45d6b28f 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -391,7 +391,7 @@ Don't move back past the buffer position LIMIT.
 This function is called when we are going to break the current line
 after or before a non-ASCII character.  If the charset of the
 character has the property `fill-find-break-point-function', this
-function calls the property value as a function with one arg LINEBEG.
+function calls the property value as a function with one arg LIMIT.
 If the charset has no such property, do nothing."
   (let* ((ch (following-char))
          (charset (char-charset ch))