Merged from miles@gnu.org--gnu-2005 (patch 159)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-159
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-307

12 files changed, 173 insertions, 111 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d65a446a376..a3826bf9a4b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,50 @@
+2005-03-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * menu-bar.el (menu-bar-file-menu): Add the same :enable to
+        "Open Directory" as for "Open File".
+
+2005-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (activate-mark-hook, deactivate-mark-hook): Add defvars.
+        (push-mark-command): Run activate-mark-hook.
+
+2005-03-06  Richard M. Stallman  <rms@gnu.org>
+
+        * help-mode.el (help-mode-finish): Don't alter the element
+        in view-return-to-alist if there already is one.
+
+        * jit-lock.el (jit-lock-stealth-fontify): When calling sit-for,
+        make sure the current buffer is the expected one.
+
+        * novice.el (disabled-command-function): Output in *Disabled Command*.
+        Explicitly ignore non-keyboard events, and explicitly handle C-g.
+
+        * textmodes/flyspell.el (flyspell-large-region):
+        Pass args differently for aspell.
+
+        * files.el (mode-require-final-newline): Doc fix.
+
+2005-03-03  Stephan Stahl  <stahl@eos.franken.de> (tiny change)
+
+        * progmodes/which-func.el (which-function): 
+        Specify NOERROR when calling imenu--make-index-alist.
+
+2005-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * simple.el (normal-erase-is-backspace): Define default value.
+
+        * custom.el (custom-theme-set-variables): Remove unused var `immediate'.
+        (custom-reevaluate-setting): Simple function to handle
+        variables that are defined before their default value can really
+        be computed.
+
+        * startup.el (command-line): Use it for temporary-file-directory,
+        small-emporary-file-directory, auto-save-file-name-transforms,
+        blink-cursor-mode, and normal-erase-is-backspace.
+
+        * font-lock.el (font-lock-fontify-keywords-region): Ensure forward
+        progress, even with buggy anchored keywords.
+
 2005-03-05  Luc Teirlinck  <teirllm@auburn.edu>
 
         * simple.el (goto-line): Remove unbalanced final parenthesis.
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 7d67095566c..a581027993c 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -701,6 +701,7 @@ language you are using."
 (define-key global-map "\C-p" 'previous-line)
 (define-key ctl-x-map "\C-n" 'set-goal-column)
 (define-key global-map "\C-e" 'move-end-of-line)
+(define-key esc-map "g" 'goto-line)
 
 ;;(defun function-key-error ()
 ;;  (interactive)
diff --git a/lisp/custom.el b/lisp/custom.el
index 13195c7f78f..77b54a109c5 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1,6 +1,6 @@
 ;;; custom.el --- tools for declaring and initializing options
 ;;
-;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2004
+;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2004, 2005
 ;;  Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
@@ -726,6 +726,15 @@ handle SYMBOL properly.
 COMMENT is a comment string about SYMBOL."
   (apply 'custom-theme-set-variables 'user args))
 
+(defun custom-reevaluate-setting (symbol)
+  "Reset the value of SYMBOL by re-evaluating its saved or default value.
+This is useful for variables that are defined before their default value
+can really be computed.  E.g. dumped variables whose default depends on
+run-time information."
+  (funcall (or (get symbol 'custom-set) 'set-default)
+           symbol
+           (eval (car (or (get symbol 'saved-value) (get symbol 'standard-value))))))
+
 (defun custom-theme-set-variables (theme &rest args)
   "Initialize variables for theme THEME according to settings in ARGS.
 Each of the arguments in ARGS should be a list of this form:
@@ -753,44 +762,43 @@ SYMBOL's property `force-value' is set to the symbol `immediate'.
 EXP itself is saved unevaluated as SYMBOL property `saved-value' and
 in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
   (custom-check-theme theme)
-  (let ((immediate (get theme 'theme-immediate)))
-    (setq args
-          (sort args
-                (lambda (a1 a2)
-                  (let* ((sym1 (car a1))
-                         (sym2 (car a2))
-                         (1-then-2 (memq sym1 (get sym2 'custom-dependencies)))
-                         (2-then-1 (memq sym2 (get sym1 'custom-dependencies))))
-                    (cond ((and 1-then-2 2-then-1)
-                           (error "Circular custom dependency between `%s' and `%s'"
-                                  sym1 sym2))
-                          (2-then-1 nil)
-                          ;; Put symbols with :require last.  The macro
-                          ;; define-minor-mode generates a defcustom
-                          ;; with a :require and a :set, where the
-                          ;; setter function calls the mode function.
-                          ;; Putting symbols with :require last ensures
-                          ;; that the mode function will see other
-                          ;; customized values rather than default
-                          ;; values.
-                          (t (nth 3 a2)))))))
-    (while args
-      (let ((entry (car args)))
-        (if (listp entry)
-            (let* ((symbol (indirect-variable (nth 0 entry)))
-                   (value (nth 1 entry))
-                   (now (nth 2 entry))
-                   (requests (nth 3 entry))
-                   (comment (nth 4 entry))
-                   set)
-              (when requests
-                (put symbol 'custom-requests requests)
-                (mapc 'require requests))
-              (setq set (or (get symbol 'custom-set) 'custom-set-default))
-              (put symbol 'saved-value (list value))
-              (put symbol 'saved-variable-comment comment)
-              (custom-push-theme 'theme-value symbol theme 'set value)
-              ;; Allow for errors in the case where the setter has
+  (setq args
+        (sort args
+              (lambda (a1 a2)
+                (let* ((sym1 (car a1))
+                       (sym2 (car a2))
+                       (1-then-2 (memq sym1 (get sym2 'custom-dependencies)))
+                       (2-then-1 (memq sym2 (get sym1 'custom-dependencies))))
+                  (cond ((and 1-then-2 2-then-1)
+                         (error "Circular custom dependency between `%s' and `%s'"
+                                sym1 sym2))
+                        (2-then-1 nil)
+                        ;; Put symbols with :require last.  The macro
+                        ;; define-minor-mode generates a defcustom
+                        ;; with a :require and a :set, where the
+                        ;; setter function calls the mode function.
+                        ;; Putting symbols with :require last ensures
+                        ;; that the mode function will see other
+                        ;; customized values rather than default
+                        ;; values.
+                        (t (nth 3 a2)))))))
+  (while args
+    (let ((entry (car args)))
+      (if (listp entry)
+          (let* ((symbol (indirect-variable (nth 0 entry)))
+                 (value (nth 1 entry))
+                 (now (nth 2 entry))
+                 (requests (nth 3 entry))
+                 (comment (nth 4 entry))
+                 set)
+            (when requests
+              (put symbol 'custom-requests requests)
+              (mapc 'require requests))
+            (setq set (or (get symbol 'custom-set) 'custom-set-default))
+            (put symbol 'saved-value (list value))
+            (put symbol 'saved-variable-comment comment)
+            (custom-push-theme 'theme-value symbol theme 'set value)
+            ;; Allow for errors in the case where the setter has
             ;; changed between versions, say, but let the user know.
             (condition-case data
                 (cond (now
@@ -802,18 +810,18 @@ in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
                        (funcall set symbol (eval value))))
               (error
                (message "Error setting %s: %s" symbol data)))
-              (setq args (cdr args))
-              (and (or now (default-boundp symbol))
-                   (put symbol 'variable-comment comment)))
-          ;; Old format, a plist of SYMBOL VALUE pairs.
-          (message "Warning: old format `custom-set-variables'")
-          (ding)
-          (sit-for 2)
-          (let ((symbol (indirect-variable (nth 0 args)))
-                (value (nth 1 args)))
-            (put symbol 'saved-value (list value))
-            (custom-push-theme 'theme-value symbol theme 'set value))
-          (setq args (cdr (cdr args))))))))
+            (setq args (cdr args))
+            (and (or now (default-boundp symbol))
+                 (put symbol 'variable-comment comment)))
+        ;; Old format, a plist of SYMBOL VALUE pairs.
+        (message "Warning: old format `custom-set-variables'")
+        (ding)
+        (sit-for 2)
+        (let ((symbol (indirect-variable (nth 0 args)))
+              (value (nth 1 args)))
+          (put symbol 'saved-value (list value))
+          (custom-push-theme 'theme-value symbol theme 'set value))
+        (setq args (cdr (cdr args)))))))
 
 (defun custom-set-default (variable value)
   "Default :set function for a customizable variable.
@@ -1091,5 +1099,5 @@ This means reset VARIABLE to its value in TO-THEME."
 
 (provide 'custom)
 
-;;; arch-tag: 041b6116-aabe-4f9a-902d-74092bc3dab2
+;; arch-tag: 041b6116-aabe-4f9a-902d-74092bc3dab2
 ;;; custom.el ends here
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 127b8fe608b..a996d4c15e7 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -39,8 +39,8 @@
 ;; modifications before inserting or typing anything.
 ;;
 ;; Faces can be selected from the keyboard as well.
-;; The standard keybindings are M-g (or ESC g) + letter:
-;; M-g i = "set italic",  M-g b = "set bold", etc.
+;; The standard keybindings are M-o (or ESC o) + letter:
+;; M-o i = "set italic",  M-o b = "set bold", etc.
 
 ;;; Customization:
 ;; An alternative set of keybindings that may be easier to type can be set up
@@ -91,12 +91,12 @@
   (require 'button))
 
 ;;; Provide some binding for startup:
-;;;###autoload (define-key global-map "\M-g" 'facemenu-keymap)
+;;;###autoload (define-key global-map "\M-o" 'facemenu-keymap)
 ;;;###autoload (autoload 'facemenu-keymap "facemenu" "Keymap for face-changing commands." t 'keymap)
 
 ;; Global bindings:
 (define-key global-map [C-down-mouse-2] 'facemenu-menu)
-(define-key global-map "\M-g" 'facemenu-keymap)
+(define-key global-map "\M-o" 'facemenu-keymap)
 
 (defgroup facemenu nil
   "Create a face menu for interactively adding fonts to text"
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 0b82e738014..f2cd0985958 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1,7 +1,7 @@
 ;;; font-lock.el --- Electric font lock mode
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004 2005  Free Software Foundation, Inc.
 
 ;; Author: jwz, then rms, then sm
 ;; Maintainer: FSF
@@ -1425,7 +1425,10 @@ LOUDLY, if non-nil, allows progress-meter bar."
         (while highlights
           (if (numberp (car (car highlights)))
               (font-lock-apply-highlight (car highlights))
-            (font-lock-fontify-anchored-keywords (car highlights) end))
+            (let ((pos (point)))
+              (font-lock-fontify-anchored-keywords (car highlights) end)
+              ;; Ensure forward progress.
+              (if (< (point) pos) (goto-char pos))))
           (setq highlights (cdr highlights))))
       (setq keywords (cdr keywords)))))
 
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index e9d3561d251..8b0284089fc 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -194,8 +194,12 @@ Commands:
 ;;;###autoload
 (defun help-mode-finish ()
   (let ((entry (assq (selected-window) view-return-to-alist)))
-        (if entry (setcdr entry (cons (selected-window)
-                                      help-return-method))
+        (if entry
+            ;; When entering Help mode from the Help window,
+            ;; such as by following a link, preserve the same
+            ;; meaning for the q command.
+            ;; (setcdr entry (cons (selected-window) help-return-method))
+            nil
           (setq view-return-to-alist
                 (cons (cons (selected-window) help-return-method)
                       view-return-to-alist))))
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index 43c8457c80b..fe64d871d96 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -415,6 +415,7 @@ This functions is called after Emacs has been idle for
   (unless (or executing-kbd-macro
               (window-minibuffer-p (selected-window)))
     (let ((buffers (buffer-list))
+          (outer-buffer (current-buffer))
           minibuffer-auto-raise
           message-log-max)
       (with-local-quit
@@ -449,7 +450,10 @@ This functions is called after Emacs has been idle for
                       (point (point-min)))
                   (while (and (setq start
                                     (jit-lock-stealth-chunk-start point))
-                              (sit-for nice))
+                              ;; In case sit-for runs any timers,
+                              ;; give them the expected current buffer.
+                              (with-current-buffer outer-buffer
+                                (sit-for nice)))
 
                     ;; fontify a block.
                     (jit-lock-fontify-now start (+ start jit-lock-chunk-size))
@@ -461,7 +465,10 @@ This functions is called after Emacs has been idle for
                     ;; Wait a little if load is too high.
                     (when (and jit-lock-stealth-load
                                (> (car (load-average)) jit-lock-stealth-load))
-                      (sit-for (or jit-lock-stealth-time 30)))))))))))))
+                      ;; In case sit-for runs any timers,
+                      ;; give them the expected current buffer.
+                      (with-current-buffer outer-buffer
+                        (sit-for (or jit-lock-stealth-time 30))))))))))))))
 
 
 
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 093969d5725..8dfb6a792df 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -184,6 +184,8 @@ A large number or nil slows down menu responsiveness."
               :help "Insert another file into current buffer"))
 (define-key menu-bar-file-menu [dired]
   '(menu-item "Open Directory..." dired
+              :enable (not (window-minibuffer-p
+                            (frame-selected-window menu-updating-frame)))
               :help "Read a directory, operate on its files"))
 (define-key menu-bar-file-menu [open-file]
   '(menu-item "Open File..." find-file-existing
diff --git a/lisp/novice.el b/lisp/novice.el
index de92857980b..3e63f0a7bc6 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -49,7 +49,7 @@ If nil, the feature is disabled, i.e., all commands work normally.")
 (defun disabled-command-function (&rest ignore)
   (let (char)
     (save-window-excursion
-     (with-output-to-temp-buffer "*Help*"
+     (with-output-to-temp-buffer "*Disabled Command*"
        (let ((keys (this-command-keys)))
          (if (or (eq (aref keys 0)
                      (if (stringp keys)
@@ -68,7 +68,7 @@ If nil, the feature is disabled, i.e., all commands work normally.")
          (princ "It is disabled because new users often find it confusing.\n")
          (princ "Here's the first part of its description:\n\n")
          ;; Keep only the first paragraph of the documentation.
-         (with-current-buffer "*Help*"
+         (with-current-buffer "*Disabled Command*"
            (goto-char (point-max))
            (let ((start (point)))
              (save-excursion
@@ -91,10 +91,15 @@ SPC to try the command just this once, but leave it disabled.
         (help-mode)))
      (message "Type y, n, ! or SPC (the space bar): ")
      (let ((cursor-in-echo-area t))
-       (while (not (memq (setq char (downcase (read-char)))
-                         '(?! ?y ?n ?\ )))
+       (while (progn (setq char (read-event))
+                     (or (not (numberp char))
+                         (not (memq (downcase char)
+                                    '(?! ?y ?n ?\  ?\C-g)))))
          (ding)
          (message "Please type y, n, ! or SPC (the space bar): "))))
+    (setq char (downcase char))
+    (if (= char ?\C-g)
+        (setq quit-flag t))
     (if (= char ?!)
         (setq disabled-command-function nil))
     (if (= char ?y)
diff --git a/lisp/simple.el b/lisp/simple.el
index 0b40d53b756..50a727aa15f 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2917,6 +2917,14 @@ START and END specify the portion of the current buffer to be copied."
 (put 'mark-inactive 'error-conditions '(mark-inactive error))
 (put 'mark-inactive 'error-message "The mark is not active now")
 
+(defvar activate-mark-hook nil
+  "Hook run when the mark becomes active.
+It is also run at the end of a command, if the mark is active and
+it is possible that the region may have changed")
+
+(defvar deactivate-mark-hook nil
+  "Hook run when the mark becomes inactive.")
+
 (defun mark (&optional force)
   "Return this buffer's mark value as integer; error if mark inactive.
 If optional argument FORCE is non-nil, access the mark value
@@ -3008,6 +3016,7 @@ Display `Mark set' unless the optional second arg NOMSG is non-nil."
     (if (or arg (null mark) (/= mark (point)))
         (push-mark nil nomsg t)
       (setq mark-active t)
+      (run-hooks 'activate-mark-hook)
       (unless nomsg
         (message "Mark activated")))))
 
@@ -5029,7 +5038,17 @@ the front of the list of recently selected ones."
 
 ;;; Handling of Backspace and Delete keys.
 
-(defcustom normal-erase-is-backspace nil
+(defcustom normal-erase-is-backspace
+  (and (not noninteractive)
+       (or (memq system-type '(ms-dos windows-nt))
+           (and (memq initial-window-system '(x))
+                (fboundp 'x-backspace-delete-keys-p)
+                (x-backspace-delete-keys-p))
+           ;; If the terminal Emacs is running on has erase char
+           ;; set to ^H, use the Backspace key for deleting
+           ;; backward and, and the Delete key for deleting forward.
+           (and (null initial-window-system)
+                (eq tty-erase-char ?\^H))))
   "If non-nil, Delete key deletes forward and Backspace key deletes backward.
 
 On window systems, the default value of this option is chosen
diff --git a/lisp/startup.el b/lisp/startup.el
index b16cfdeb0c9..d0eca538f96 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,7 +1,7 @@
 ;;; startup.el --- process Emacs shell arguments
 
-;; Copyright (C) 1985, 86, 92, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 2004
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+;;   2001, 2002, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -568,22 +568,9 @@ opening the first frame (e.g. open a connection to the server).")
   (setq command-line-default-directory default-directory)
 
   ;; Choose a reasonable location for temporary files.
-  (setq temporary-file-directory
-        (file-name-as-directory
-         (cond ((memq system-type '(ms-dos windows-nt))
-                (or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
-               ((memq system-type '(vax-vms axp-vms))
-                (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "SYS$SCRATCH:"))
-               (t
-                (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp")))))
-  (setq small-temporary-file-directory
-        (if (eq system-type 'ms-dos)
-            (getenv "TMPDIR")))
-  (setq auto-save-file-name-transforms
-        (list (list (car (car auto-save-file-name-transforms))
-                    ;; Don't put "\\2" inside expand-file-name, since
-                    ;; it will be transformed to "/2" on DOS/Windows.
-                    (concat temporary-file-directory "\\2") t)))
+  (custom-reevaluate-setting 'temporary-file-directory)
+  (custom-reevaluate-setting 'small-emporary-file-directory)
+  (custom-reevaluate-setting 'auto-save-file-name-transforms)
 
   ;; See if we should import version-control from the environment variable.
   (let ((vc (getenv "VERSION_CONTROL")))
@@ -749,35 +736,14 @@ opening the first frame (e.g. open a connection to the server).")
     (tool-bar-mode 1))
 
   ;; Can't do this init in defcustom because the relevant variables
-  ;; are not set.  If you make any changes to the `or' form below,
-  ;; you should also change the corresponding expression in the
-  ;; defcustom in frame.el, or Custom will be badly confused.
-  (unless (or noninteractive
-              no-blinking-cursor
-              (eq system-type 'ms-dos)
-              (not (memq initial-window-system '(x w32))))
-    (blink-cursor-mode 1))
-
-  (unless noninteractive
-    ;; DOS/Windows systems have a PC-type keyboard which has both
-    ;; <delete> and <backspace> keys.
-    (when (or (memq system-type '(ms-dos windows-nt))
-              (and (memq initial-window-system '(x))
-                   (fboundp 'x-backspace-delete-keys-p)
-                   (x-backspace-delete-keys-p))
-              ;; If the terminal Emacs is running on has erase char
-              ;; set to ^H, use the Backspace key for deleting
-              ;; backward and, and the Delete key for deleting forward.
-              (and (null initial-window-system)
-                   (eq tty-erase-char 8)))
-      (setq-default normal-erase-is-backspace t)
-      (normal-erase-is-backspace-mode 1)))
+  ;; are not set.
+  (custom-reevaluate-setting 'blink-cursor-mode)
+  (custom-reevaluate-setting 'normal-erase-is-backspace)
 
   (unless (or noninteractive
               emacs-quick-startup
               (not (display-graphic-p))
               (not (fboundp 'x-show-tip)))
-    (setq-default tooltip-mode t)
     (tooltip-mode 1))
 
   ;; Register default TTY colors for the case the terminal hasn't a
@@ -1757,5 +1723,5 @@ normal otherwise."
       (setq file (replace-match "/" t t file)))
     file))
 
-;;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db
+;; arch-tag: 7e294698-244d-4758-984b-4047f887a5db
 ;;; startup.el ends here
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index c224a970e01..7020426b9a8 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1329,7 +1329,7 @@ Word syntax described by `ispell-dictionary-alist' (which see)."
                     nil
                     buffer
                     nil
-                    "-l"
+                    (if ispell-really-aspell "list" "-l")
                     (let (args)
                       ;; Local dictionary becomes the global dictionary in use.
                       (if ispell-local-dictionary