Merge from emacs--rel--22

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

4 files changed, 50 insertions, 45 deletions

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