Merge from emacs-24; up to 117634

10 files changed, 69 insertions, 22 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1def6877f2c..56da0d6e154 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2014-10-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/cc-defs.el (c--macroexpand-all): New function (bug#18845).
+        (c-lang-defconst):
+        * progmodes/cc-langs.el (c-make-init-lang-vars-fun): Use it.
+
+2014-10-30  Eli Zaretskii  <eliz@gnu.org>
+
+        * progmodes/compile.el (compilation-start):
+        If compilation-scroll-output is non-nil, don't force window-start of
+        the compilation buffer to be at beginning of buffer.  (Bug#18874)
+
+        * startup.el (fancy-about-text): Read the entire tutorial, not
+        just its first 256 bytes.  (Bug#18760)
+
+2014-10-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/bytecomp.el: Require cl-extra (bug#18804).
+        * emacs-lisp/cl-extra.el: Add missing provide.
+
+        * emacs-lisp/bytecomp.el (byte-compile-and-folded): Optimize case where
+        all args are copyable (bug#18767).
+        (=, <, >, <=, >=): Re-enable the optimization.
+
 2014-10-29  Glenn Morris  <rgm@gnu.org>
 
         * net/rcirc.el (rcirc-fill-column): Unbump :version.  Mark :risky.
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 62de943f1be..392f6ee83cd 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -120,7 +120,11 @@
 (require 'backquote)
 (require 'macroexp)
 (require 'cconv)
-(eval-when-compile (require 'cl-lib))
+
+;; During bootstrap, cl-loaddefs.el is not created yet, so loading cl-lib
+;; doesn't setup autoloads for things like cl-every, which is why we have to
+;; require cl-extra instead (bug#18804).
+(require 'cl-extra)
 
 (or (fboundp 'defsubst)
     ;; This really ought to be loaded already!
@@ -3283,11 +3287,11 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\""
 (byte-defop-compiler cons               2)
 (byte-defop-compiler aref               2)
 (byte-defop-compiler set                2)
-(byte-defop-compiler (= byte-eqlsign)   2) ;; -and  bug#18767
-(byte-defop-compiler (< byte-lss)       2) ;; -and  bug#18767
-(byte-defop-compiler (> byte-gtr)       2) ;; -and  bug#18767
-(byte-defop-compiler (<= byte-leq)      2) ;; -and  bug#18767
-(byte-defop-compiler (>= byte-geq)      2) ;; -and  bug#18767
+(byte-defop-compiler (= byte-eqlsign)   2-and)
+(byte-defop-compiler (< byte-lss)       2-and)
+(byte-defop-compiler (> byte-gtr)       2-and)
+(byte-defop-compiler (<= byte-leq)      2-and)
+(byte-defop-compiler (>= byte-geq)      2-and)
 (byte-defop-compiler get                2)
 (byte-defop-compiler nth                2)
 (byte-defop-compiler substring          2-3)
@@ -3354,13 +3358,14 @@ If it is nil, then the handler is \"byte-compile-SYMBOL.\""
 (defun byte-compile-and-folded (form)
   "Compile calls to functions like `<='.
 These implicitly `and' together a bunch of two-arg bytecodes."
-  ;; FIXME: bug#18767 means we can't do it this way!
   (let ((l (length form)))
     (cond
      ((< l 3) (byte-compile-form `(progn ,(nth 1 form) t)))
      ((= l 3) (byte-compile-two-args form))
-     (t (byte-compile-form `(and (,(car form) ,(nth 1 form) ,(nth 2 form))
-                                 (,(car form) ,@(nthcdr 2 form))))))))
+     ((cl-every #'macroexp-copyable-p (nthcdr 2 form))
+      (byte-compile-form `(and (,(car form) ,(nth 1 form) ,(nth 2 form))
+                               (,(car form) ,@(nthcdr 2 form)))))
+     (t (byte-compile-normal-call form)))))
 
 (defun byte-compile-three-args (form)
   (if (not (= (length form) 4))
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index a7970261608..b8b7b2c170b 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -720,4 +720,5 @@ including `cl-block' and `cl-eval-when'."
 ;; generated-autoload-file: "cl-loaddefs.el"
 ;; End:
 
+(provide 'cl-extra)
 ;;; cl-extra.el ends here
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index 178b23e1fca..4e3b71e3104 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -984,7 +984,7 @@ Otherwise return the normal value."
 ;; macros, since it enables certain macros to be shared between X and TTY modes
 ;; by correctly mapping key sequences for Left/Right/... (on an ascii
 ;; terminal) into logical keys left, right, etc.
-(defun viper-read-key ()
+(defun viper-read-key () ;; FIXME: Use `read-key'?
   (let ((overriding-local-map viper-overriding-map)
         (inhibit-quit t)
         help-char key)
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index d1353bdc8fa..c7394e1cea5 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -531,6 +531,7 @@ If Viper is enabled, turn it off.  Otherwise, turn it on."
         (if viper-mode
             ()
           (setq viper-mode t)
+          ;; FIXME: Don't reload!
           (load-library "viper"))
 
         (if viper-first-time ; Important check.  Prevents mix-up of startup
@@ -887,6 +888,7 @@ Two differences:
   ;; When viper-mode is executed in such a case, it will set the major mode
   ;; back to fundamental-mode.
   (if (eq (default-value 'major-mode) 'fundamental-mode)
+      ;; FIXME: We should use after-change-major-mode-hook instead!
       (setq-default major-mode 'viper-mode))
 
   (viper-setup-ESC-to-escape t)
@@ -936,6 +938,7 @@ Two differences:
 
   (defadvice self-insert-command (around viper-self-insert-ad activate)
     "Ignore all self-inserting keys in the vi-state."
+    ;; FIXME: Use remapping?
     (if (and (eq viper-current-state 'vi-state)
              ;; Do not use called-interactively-p here. XEmacs does not have it
              ;; and interactive-p is just fine.
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 47e76c3ea1e..fae6be433fd 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -265,9 +265,7 @@ nil           - don't add to mode line."
            (erc-track-add-to-mode-line val))))
 
 (defun erc-modified-channels-object (strings)
-  "Generate a new `erc-modified-channels-object' based on STRINGS.
-If STRINGS is nil, we initialize `erc-modified-channels-object' to
-an appropriate initial value for this flavor of Emacs."
+  "Generate a new `erc-modified-channels-object' based on STRINGS."
   (if strings
       (if (featurep 'xemacs)
           (let ((e-m-c-s '("[")))
@@ -743,7 +741,7 @@ only consider active buffers visible.")
 (defvar erc-modified-channels-update-inside nil
   "Variable to prevent running `erc-modified-channels-update' multiple
 times.  Without it, you cannot debug `erc-modified-channels-display',
-because the debugger also cases changes to the window-configuration.")
+because the debugger also causes changes to the window-configuration.")
 
 (defun erc-modified-channels-update (&rest _args)
   "This function updates the information in `erc-modified-channels-alist'
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index dc31fde131d..1d8b8abeb2f 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -174,6 +174,10 @@ This variant works around bugs in `eval-when-compile' in various
 
   (put 'cc-eval-when-compile 'lisp-indent-hook 0))
 
+(eval-and-compile
+  (defalias 'c--macroexpand-all
+    (if (fboundp 'macroexpand-all)
+        'macroexpand-all 'cl-macroexpand-all)))
 
 ;;; Macros.
 
@@ -1841,7 +1845,7 @@ system."
 immediately, i.e. at the same time as the `c-lang-defconst' form
 itself is evaluated."
   ;; Evaluate at macro expansion time, i.e. in the
-  ;; `macroexpand-all' inside `c-lang-defconst'.
+  ;; `c--macroexpand-all' inside `c-lang-defconst'.
   (eval form))
 
 (defmacro c-lang-defconst (name &rest args)
@@ -1885,7 +1889,7 @@ constant.  A file is identified by its base name."
 
   (let* ((sym (intern (symbol-name name) c-lang-constants))
          ;; Make `c-lang-const' expand to a straightforward call to
-         ;; `c-get-lang-constant' in `macroexpand-all' below.
+         ;; `c-get-lang-constant' in `c--macroexpand-all' below.
          ;;
          ;; (The default behavior, i.e. to expand to a call inside
          ;; `eval-when-compile' should be equivalent, since that macro
@@ -1948,7 +1952,7 @@ constant.  A file is identified by its base name."
         ;; reason, but we also use this expansion handle
         ;; `c-lang-defconst-eval-immediately' and to register
         ;; dependencies on the `c-lang-const's in VAL.)
-        (setq val (macroexpand-all val))
+        (setq val (c--macroexpand-all val))
 
         (setq bindings `(cons (cons ',assigned-mode (lambda () ,val)) ,bindings)
               args (cdr args))))
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index bab928ac5dd..a8dc3b8968c 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -3238,7 +3238,7 @@ accomplish that conveniently."
       `(lambda ()
 
          ;; This let sets up the context for `c-mode-var' and similar
-         ;; that could be in the result from `macroexpand-all'.
+         ;; that could be in the result from `c--macroexpand-all'.
          (let ((c-buffer-is-cc-mode ',mode)
                current-var source-eval)
            (c-make-emacs-variables-local)
@@ -3248,12 +3248,12 @@ accomplish that conveniently."
                    (setq ,@(let ((c-buffer-is-cc-mode mode)
                                  (c-lang-const-expansion 'immediate))
                              ;; `c-lang-const' will expand to the evaluated
-                             ;; constant immediately in `macroexpand-all'
+                             ;; constant immediately in `c--macroexpand-all'
                              ;; below.
                               (mapcan
                                (lambda (init)
                                  `(current-var ',(car init)
-                                   ,(car init) ,(macroexpand-all
+                                   ,(car init) ,(c--macroexpand-all
                                                  (elt init 1))))
                                ;; Note: The following `append' copies the
                                ;; first argument.  That list is small, so
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index ee066f4c56c..d3d03cd2030 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1676,7 +1676,16 @@ Returns the compilation buffer created."
              (list command mode name-function highlight-regexp))
         (set (make-local-variable 'revert-buffer-function)
              'compilation-revert-buffer)
-        (and outwin (set-window-start outwin (point-min)))
+        (and outwin
+             ;; Forcing the window-start overrides the usual redisplay
+             ;; feature of bringing point into view, so setting the
+             ;; window-start to top of the buffer risks losing the
+             ;; effect of moving point to EOB below, per
+             ;; compilation-scroll-output, if the command is long
+             ;; enough to push point outside of the window.  This
+             ;; could happen, e.g., in `rgrep'.
+             (not compilation-scroll-output)
+             (set-window-start outwin (point-min)))
 
         ;; Position point as the user will see it.
         (let ((desired-visible-point
diff --git a/lisp/startup.el b/lisp/startup.el
index 0dacf191c14..88611a0cd8f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1496,7 +1496,10 @@ Each element in the list should be a list of strings or pairs
               (title (with-temp-buffer
                        (insert-file-contents
                         (expand-file-name tut tutorial-directory)
-                        nil 0 256)
+                        ;; Reat the entire file, to make sure any
+                        ;; coding cookies and other local variables
+                        ;; get acted upon.
+                        nil)
                        (search-forward ".")
                        (buffer-substring (point-min) (1- (point))))))
          ;; If there is a specific tutorial for the current language