upstream

14 files changed, 116 insertions, 29 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 88248f00559..6aa1bddb9f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2011-10-27  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/cl-extra.el (most-positive-float, most-negative-float)
+        (least-positive-float, least-negative-float)
+        (least-positive-normalized-float, least-negative-normalized-float)
+        (float-epsilon, float-negative-epsilon):
+        Remove unnecessary declarations.
+
+        * emacs-lisp/cl-extra.el (cl-float-limits): Add doc string.
+        * emacs-lisp/cl.el (most-positive-float, most-negative-float)
+        (least-positive-float, least-negative-float)
+        (least-positive-normalized-float, least-negative-normalized-float)
+        (float-epsilon, float-negative-epsilon): Add doc-strings,
+        based on those in cl.texi.
+
+        * files.el (set-visited-file-name): If the major-mode changed,
+        reload the local variables.  (Bug#9796)
+
+2011-10-27  Chong Yidong  <cyd@gnu.org>
+
+        * subr.el (change-major-mode-after-body-hook): New hook.
+        (run-mode-hooks): Run it.
+
+        * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Use
+        change-major-mode-before-body-hook.
+
+        * simple.el (fundamental-mode):
+        * emacs-lisp/derived.el (define-derived-mode): Revert 2010-04-28
+        change introducing fundamental-mode-hook.
+
+2011-10-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * term/w32-win.el (w32-default-color-map): Declare obsolete.  (Bug#9785)
+
 2011-10-26  Michael Albinus  <michael.albinus@gmx.de>
 
         * ido.el (ido-file-name-all-completions-1): Do not require
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 7468a0237cf..8ea58b2e07c 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -480,17 +480,13 @@ If STATE is t, return a new state object seeded from the time of day."
         (and (numberp res) (/= res (/ res 2)) res))
     (arith-error nil)))
 
-(defvar most-positive-float)
-(defvar most-negative-float)
-(defvar least-positive-float)
-(defvar least-negative-float)
-(defvar least-positive-normalized-float)
-(defvar least-negative-normalized-float)
-(defvar float-epsilon)
-(defvar float-negative-epsilon)
-
 ;;;###autoload
 (defun cl-float-limits ()
+  "Initialize the Common Lisp floating-point parameters.
+This sets the values of: `most-positive-float', `most-negative-float',
+`least-positive-float', `least-negative-float', `float-epsilon',
+`float-negative-epsilon', `least-positive-normalized-float', and
+`least-negative-normalized-float'."
   (or most-positive-float (not (numberp '2e1))
       (let ((x '2e0) y z)
         ;; Find maximum exponent (first two loops are optimizations)
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 526475eb1bd..0b34e9f27f7 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -333,15 +333,51 @@ always returns nil."
 
 (defvar *random-state* (vector 'cl-random-state-tag -1 30 (cl-random-time)))
 
-;; The following are actually set by cl-float-limits.
-(defconst most-positive-float nil)
-(defconst most-negative-float nil)
-(defconst least-positive-float nil)
-(defconst least-negative-float nil)
-(defconst least-positive-normalized-float nil)
-(defconst least-negative-normalized-float nil)
-(defconst float-epsilon nil)
-(defconst float-negative-epsilon nil)
+(defconst most-positive-float nil
+  "The largest value that a Lisp float can hold.
+If your system supports infinities, this is the largest finite value.
+For IEEE machines, this is approximately 1.79e+308.
+Call `cl-float-limits' to set this.")
+
+(defconst most-negative-float nil
+  "The largest negative value that a Lisp float can hold.
+This is simply -`most-negative-float'.
+Call `cl-float-limits' to set this.")
+
+(defconst least-positive-float nil
+  "The smallest value greater than zero that a Lisp float can hold.
+For IEEE machines, it is about 4.94e-324 if denormals are supported,
+or 2.22e-308 if they are not.
+Call `cl-float-limits' to set this.")
+
+(defconst least-negative-float nil
+  "The smallest value less than zero that a Lisp float can hold.
+This is simply -`least-positive-float'.
+Call `cl-float-limits' to set this.")
+
+(defconst least-positive-normalized-float nil
+  "The smallest normalized Lisp float greater than zero.
+This is the smallest value for which IEEE denormalization does not lose
+precision.  For IEEE machines, this value is about 2.22e-308.
+For machines that do not support the concept of denormalization
+and gradual underflow, this constant equals `least-positive-float'.
+Call `cl-float-limits' to set this.")
+
+(defconst least-negative-normalized-float nil
+  "The smallest normalized Lisp float less than zero.
+This is simply -`least-positive-normalized-float'.
+Call `cl-float-limits' to set this.")
+
+(defconst float-epsilon nil
+  "The smallest positive float that adds to 1.0 to give a distinct value.
+Adding a number less than this to 1.0 returns 1.0 due to roundoff.
+For IEEE machines, epsilon is about 2.22e-16.
+Call `cl-float-limits' to set this.")
+
+(defconst float-negative-epsilon nil
+  "The smallest positive float that subtracts from 1.0 to give a distinct value.
+For IEEE machines, it is about 1.11e-16.
+Call `cl-float-limits' to set this.")
 
 
 ;;; Sequence functions.
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 81932f9940a..55ea102ed2a 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -230,7 +230,7 @@ No problems result if this variable is not bound.
                                         ; Run the parent.
          (delay-mode-hooks
 
-          (,(or parent 'fundamental-mode))
+          (,(or parent 'kill-all-local-variables))
                                         ; Identify the child mode.
           (setq major-mode (quote ,child))
           (setq mode-name ,name)
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 4b6f4d634ca..bf9f2c9d6ed 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -368,11 +368,13 @@ See `%s' for more information on %s."
              (progn
                (add-hook 'after-change-major-mode-hook
                          ',MODE-enable-in-buffers)
-               (add-hook 'fundamental-mode-hook ',MODE-enable-in-buffers)
+               (add-hook 'change-major-mode-after-body-hook
+                         ',MODE-enable-in-buffers)
                (add-hook 'find-file-hook ',MODE-check-buffers)
                (add-hook 'change-major-mode-hook ',MODE-cmhh))
            (remove-hook 'after-change-major-mode-hook ',MODE-enable-in-buffers)
-           (remove-hook 'fundamental-mode-hook ',MODE-enable-in-buffers)
+           (remove-hook 'change-major-mode-after-body-hook
+                        ',MODE-enable-in-buffers)
            (remove-hook 'find-file-hook ',MODE-check-buffers)
            (remove-hook 'change-major-mode-hook ',MODE-cmhh))
 
diff --git a/lisp/files.el b/lisp/files.el
index 3ed9bd5a272..40e2df14c1b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3682,7 +3682,11 @@ the old visited file has been renamed to the new name FILENAME."
           (get major-mode 'mode-class)
           ;; Don't change the mode if the local variable list specifies it.
           (hack-local-variables t)
-          (set-auto-mode t))
+          ;; TODO consider making normal-mode handle this case.
+          (let ((old major-mode))
+            (set-auto-mode t)
+            (or (eq old major-mode)
+                (hack-local-variables))))
     (error nil)))
 
 (defun write-file (filename &optional confirm)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8b4e993149e..7519252f037 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * message.el (message-completion-function): Make sure
+        message-tab-body-function is not attempted if one of
+        message-completion-alist fails to find a completion (bug#9158).
+
 2011-10-26  Daiki Ueno  <ueno@unixuser.org>
 
         * mml.el (mml-quote-region): Quote <#secure> tag.
@@ -7,7 +13,7 @@
 
         * gnus-cite.el (gnus-message-citation-mode): Doc fix (in Emacs 24,
         calling a minor mode from Lisp with nil arg enables it, so we have to
-        make the working a bit ambiguous here).
+        make the wording a bit ambiguous here).
 
 2011-10-18  Teodor Zlatanov  <tzz@lifelogs.com>
 
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 948892d1e13..723f8fb72b5 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7888,7 +7888,11 @@ those headers."
                 (let ((mail-abbrev-mode-regexp (caar alist)))
                   (not (mail-abbrev-in-expansion-header-p))))
       (setq alist (cdr alist)))
-    (cdar alist)))
+    (when (cdar alist)
+      (lexical-let ((fun (cdar alist)))
+        ;; Even if completion fails, return a non-nil value, so as to avoid
+        ;; falling back to message-tab-body-function.
+        (lambda () (funcall fun) 'completion-attempted)))))
 
 (eval-and-compile
   (condition-case nil
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 9ba95e4d11a..870f2bece28 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -708,7 +708,7 @@
 (define-charset-alias 'cp866u 'cp1125)
 
 ;; Fixme: C.f. iconv, http://czyborra.com/charsets/codepages.html
-;; shows this as not ASCII comptaible, with various graphics in
+;; shows this as not ASCII compatible, with various graphics in
 ;; 0x01-0x1F.
 (define-charset 'cp437
   "CP437 (MS-DOS United States, Australia, New Zealand, South Africa)"
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 9fbeb9f1882..ae150621dc0 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1871,7 +1871,7 @@
 
         * org-list.el (org-list-separating-blank-lines-number): Fix
         confusion between point and item beginning.  Now, if no
-        information is avalaible, truly follow user preference when it
+        information is available, truly follow user preference when it
         inserts blank lines manually.
         (org-list-insert-item): Send correct argument to the preceding
         function.
diff --git a/lisp/simple.el b/lisp/simple.el
index 79de6aea3dd..90d22c817b0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -349,7 +349,8 @@ location."
 Other major modes are defined by comparison with this one."
   (interactive)
   (kill-all-local-variables)
-  (run-mode-hooks 'fundamental-mode-hook))
+  (unless delay-mode-hooks
+    (run-hooks 'after-change-major-mode-hook)))
 
 ;; Special major modes to view specially formatted data rather than files.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index 7ac287d2473..f3cd4dabe20 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1530,6 +1530,9 @@ if it is empty or a duplicate."
 (make-variable-buffer-local 'delayed-mode-hooks)
 (put 'delay-mode-hooks 'permanent-local t)
 
+(defvar change-major-mode-after-body-hook nil
+  "Normal hook run in major mode functions, before the mode hooks.")
+
 (defvar after-change-major-mode-hook nil
   "Normal hook run at the very end of major mode functions.")
 
@@ -1546,7 +1549,7 @@ FOO-mode-hook."
     ;; Normal case, just run the hook as before plus any delayed hooks.
     (setq hooks (nconc (nreverse delayed-mode-hooks) hooks))
     (setq delayed-mode-hooks nil)
-    (apply 'run-hooks hooks)
+    (apply 'run-hooks (cons 'change-major-mode-after-body-hook hooks))
     (run-hooks 'after-change-major-mode-hook)))
 
 (defmacro delay-mode-hooks (&rest body)
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index e4bf031d422..b7f2a69e77b 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -85,6 +85,7 @@
 (define-obsolete-function-alias 'w32-select-font 'x-select-font "23.1")
 
 (defvar w32-color-map) ;; defined in w32fns.c
+(make-obsolete 'w32-default-color-map nil "24.1")
 
 (declare-function w32-send-sys-command "w32fns.c")
 (declare-function set-message-beep "w32console.c")
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 6f6993980db..cef8a3d1548 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -1522,7 +1522,7 @@ Valid actions are: readable, restore, read, kill, write."
 ;;;    (while all
 ;;;      (when (and (eq (car (car all)) 'bof)
 ;;;              (not (file-regular-p (nth 1 (car all)))))
-;;;     (message "File %s in saved parse info not avalable" (cdr (car all)))
+;;;     (message "File %s in saved parse info not available" (cdr (car all)))
 ;;;     (error "File not found"))
 ;;;      (setq all (cdr all))))
   )