9 files changed, 122 insertions, 56 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86b425b41e4..41b0135a708 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,42 @@
+2012-10-20  Arne Jørgensen  <arne@arnested.dk>
+
+        * progmodes/flymake.el (flymake-create-temp-inplace): Use
+        file-truename.
+
+2012-10-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * loadup.el: Update comment about uncompiled Lisp files.  (Bug#12395)
+
+2012-10-20  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc-units.el (math-extract-units): Properly extract powers
+        of units.
+
+2012-10-20  Daniel Colascione  <dancol@dancol.org>
+
+        * frame.el (make-frame): Set x-display-name as we used to in order
+        to unbreak creating an X11 frame from an Emacs daemon started
+        without a display.
+
+2012-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (minibuffer-force-complete): Make the next completion use
+        the same completion-field (bug@12221).
+
+2012-10-19  Martin Rudalics  <rudalics@gmx.at>
+
+        * emacs-lisp/debug.el (debug): Record height of debugger window
+        also when debugger will be back (Bug#8789).
+
+2012-10-18  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/gdb-mi.el (gdb-display-buffer-other-frame-action):
+        Convert to defcustom.
+        (gdb-get-source-file): Don't bind pop-up-windows.
+
+        * progmodes/gud.el (gud-display-line): Don't specially re-use
+        other frames for the gdb-mi case (Bug#12648).
+
 2012-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/advice.el: Clean up commentary a bit.
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 39f710f8322..58646ea114c 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1481,10 +1481,16 @@ If COMP or STD is non-nil, put that in the units table instead."
             (mapcar 'math-remove-units (cdr expr))))))
 
 (defun math-extract-units (expr)
-  (if (memq (car-safe expr) '(* /))
-      (cons (car expr)
-            (mapcar 'math-extract-units (cdr expr)))
-    (if (math-check-unit-name expr) expr 1)))
+  (cond
+   ((memq (car-safe expr) '(* /))
+    (cons (car expr)
+          (mapcar 'math-extract-units (cdr expr))))
+   ((and
+     (eq (car-safe expr) '^)
+     (math-check-unit-name (nth 1 expr)))
+    expr)
+   ((math-check-unit-name expr) expr)
+   (t 1)))
 
 (defun math-build-units-table-buffer (enter-buffer)
   (if (not (and math-units-table math-units-table-buffer-valid
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index c30ccf3315e..c04e68c0cfa 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -267,15 +267,17 @@ first will be printed into the backtrace buffer."
                 ;; Make sure we unbind buffer-read-only in the right buffer.
                 (save-excursion
                   (recursive-edit))))
+          (when (and (window-live-p debugger-window)
+                     (eq (window-buffer debugger-window) debugger-buffer))
+            ;; Record height of debugger window.
+            (setq debugger-previous-window-height
+                  (window-total-size debugger-window)))
           (if debugger-will-be-back
               ;; Restore previous window configuration (Bug#12623).
               (set-window-configuration window-configuration)
             (when (and (window-live-p debugger-window)
                        (eq (window-buffer debugger-window) debugger-buffer))
               (progn
-                ;; Record height of debugger window.
-                (setq debugger-previous-window-height
-                      (window-total-size debugger-window))
                 ;; Unshow debugger-buffer.
                 (quit-restore-window debugger-window debugger-bury-or-kill)
                 ;; Restore current buffer (Bug#12502).
diff --git a/lisp/frame.el b/lisp/frame.el
index b7b61bcc576..7a54efc23e7 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -655,6 +655,8 @@ the new frame according to its own rules."
       (error "Don't know how to create a frame on window system %s" w))
 
     (unless (get w 'window-system-initialized)
+      (unless x-display-name
+        (setq x-display-name display))
       (funcall (cdr (assq w window-system-initialization-alist)))
       (put w 'window-system-initialized t))
 
diff --git a/lisp/loadup.el b/lisp/loadup.el
index e0f5c6265b9..e5f2cb014d3 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -38,7 +38,8 @@
 ;; doc strings in the dumped Emacs.)  Because of this:
 
 ;; ii) If the file is loaded uncompiled, it should (where possible)
-;; obey the doc-string conventions expected by make-docfile.
+;; obey the doc-string conventions expected by make-docfile.  It
+;; should also be added to the uncompiled[] list in make-docfile.c.
 
 ;;; Code:
 
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index f464b42182d..f865a0269d4 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1134,7 +1134,23 @@ Repeated uses step through the possible completions."
       ;; through the previous possible completions.
       (let ((last (last all)))
         (setcdr last (cons (car all) (cdr last)))
-        (completion--cache-all-sorted-completions (cdr all)))))))
+        (completion--cache-all-sorted-completions (cdr all)))
+      ;; Make sure repeated uses cycle, even though completion--done might
+      ;; have added a space or something that moved us outside of the field.
+      ;; (bug#12221).
+      (let* ((table minibuffer-completion-table)
+             (pred minibuffer-completion-predicate)
+             (extra-prop completion-extra-properties)
+             (cmd
+              (lambda () "Cycle through the possible completions."
+                (interactive)
+                (let ((completion-extra-properties extra-prop))
+                  (completion-in-region start (point) table pred)))))
+        (set-temporary-overlay-map
+         (let ((map (make-sparse-keymap)))
+           (define-key map [remap completion-at-point] cmd)
+           (define-key map (vector last-command-event) cmd)
+           map)))))))
 
 (defvar minibuffer-confirm-exit-commands
   '(completion-at-point minibuffer-complete
@@ -1557,7 +1573,6 @@ variables.")
   (let* ((exit-fun (plist-get completion-extra-properties :exit-function))
          (pre-msg (and exit-fun (current-message))))
     (cl-assert (memq finished '(exact sole finished unknown)))
-    ;; FIXME: exit-fun should receive `finished' as a parameter.
     (when exit-fun
       (when (eq finished 'unknown)
         (setq finished
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 26d4a399c2d..2614af9ffa4 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1535,10 +1535,11 @@ if ARG is omitted or nil."
     (error "Invalid file-name"))
   (or prefix
       (setq prefix "flymake"))
-  (let* ((temp-name   (concat (file-name-sans-extension file-name)
-                              "_" prefix
-                              (and (file-name-extension file-name)
-                                   (concat "." (file-name-extension file-name))))))
+  (let* ((ext (file-name-extension file-name))
+         (temp-name (file-truename
+                     (concat (file-name-sans-extension file-name)
+                             "_" prefix
+                             (and ext (concat "." ext))))))
     (flymake-log 3 "create-temp-inplace: file=%s temp=%s" file-name temp-name)
     temp-name))
 
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 59c419abfc3..805ffa36e4e 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -1516,9 +1516,9 @@ this trigger is subscribed to `gdb-buf-publisher' and called with
         (comint-exec io-buffer "gdb-inferior" nil nil nil)
         (gdb-inferior-io--init-proc (get-buffer-process io-buffer))))))
 
-(defvar gdb-display-buffer-other-frame-action
-  `((display-buffer-reuse-window display-buffer-pop-up-frame)
-    (reusable-frames . 0)
+(defcustom gdb-display-buffer-other-frame-action
+  '((display-buffer-reuse-window display-buffer-pop-up-frame)
+    (reusable-frames . visible)
     (inhibit-same-window . t)
     (pop-up-frame-parameters (height . 14)
                              (width . 80)
@@ -1526,8 +1526,11 @@ this trigger is subscribed to `gdb-buf-publisher' and called with
                              (tool-bar-lines . nil)
                              (menu-bar-lines . nil)
                              (minibuffer . nil)))
-  "A `display-buffer' action for displaying GDB utility frames.")
-(put 'gdb-display-buffer-other-frame-action 'risky-local-variable t)
+  "`display-buffer' action for displaying GDB utility frames."
+  :group 'gdb
+  :type display-buffer--action-custom-type
+  :risky t
+  :version "24.3")
 
 (defun gdb-frame-io-buffer ()
   "Display IO of debugged program in another frame."
@@ -4175,9 +4178,9 @@ buffers, if required."
   (if gdb-many-windows
       (gdb-setup-windows)
     (gdb-get-buffer-create 'gdb-breakpoints-buffer)
-    (if (and gdb-show-main gdb-main-file)
-        (let ((pop-up-windows t))
-          (display-buffer (gud-find-file gdb-main-file)))))
+    (and gdb-show-main
+         gdb-main-file
+         (display-buffer (gud-find-file gdb-main-file))))
   (gdb-force-mode-line-update
    (propertize "ready" 'face font-lock-variable-name-face)))
 
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 2e3858b2cc5..719471278a8 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2700,42 +2700,39 @@ Obeying it means displaying in another window the specified file and line."
             (gud-find-file true-file)))
          (window (and buffer
                       (or (get-buffer-window buffer)
-                          (if (eq gud-minor-mode 'gdbmi)
-                              (display-buffer buffer nil 'visible))
                           (display-buffer buffer))))
          (pos))
-    (if buffer
-        (progn
-          (with-current-buffer buffer
-            (unless (or (verify-visited-file-modtime buffer) gud-keep-buffer)
-                  (if (yes-or-no-p
-                       (format "File %s changed on disk.  Reread from disk? "
-                               (buffer-name)))
-                      (revert-buffer t t)
-                    (setq gud-keep-buffer t)))
-            (save-restriction
-              (widen)
-              (goto-char (point-min))
-              (forward-line (1- line))
-              (setq pos (point))
-              (or gud-overlay-arrow-position
-                  (setq gud-overlay-arrow-position (make-marker)))
-              (set-marker gud-overlay-arrow-position (point) (current-buffer))
-              ;; If they turned on hl-line, move the hl-line highlight to
-              ;; the arrow's line.
-              (when (featurep 'hl-line)
-                (cond
-                 (global-hl-line-mode
-                  (global-hl-line-highlight))
-                 ((and hl-line-mode hl-line-sticky-flag)
-                  (hl-line-highlight)))))
-            (cond ((or (< pos (point-min)) (> pos (point-max)))
-                   (widen)
-                   (goto-char pos))))
-          (when window
-            (set-window-point window gud-overlay-arrow-position)
-            (if (eq gud-minor-mode 'gdbmi)
-                (setq gdb-source-window window)))))))
+    (when buffer
+      (with-current-buffer buffer
+        (unless (or (verify-visited-file-modtime buffer) gud-keep-buffer)
+          (if (yes-or-no-p
+               (format "File %s changed on disk.  Reread from disk? "
+                       (buffer-name)))
+              (revert-buffer t t)
+            (setq gud-keep-buffer t)))
+        (save-restriction
+          (widen)
+          (goto-char (point-min))
+          (forward-line (1- line))
+          (setq pos (point))
+          (or gud-overlay-arrow-position
+              (setq gud-overlay-arrow-position (make-marker)))
+          (set-marker gud-overlay-arrow-position (point) (current-buffer))
+          ;; If they turned on hl-line, move the hl-line highlight to
+          ;; the arrow's line.
+          (when (featurep 'hl-line)
+            (cond
+             (global-hl-line-mode
+              (global-hl-line-highlight))
+             ((and hl-line-mode hl-line-sticky-flag)
+              (hl-line-highlight)))))
+        (cond ((or (< pos (point-min)) (> pos (point-max)))
+               (widen)
+               (goto-char pos))))
+      (when window
+        (set-window-point window gud-overlay-arrow-position)
+        (if (eq gud-minor-mode 'gdbmi)
+            (setq gdb-source-window window))))))
 
 ;; The gud-call function must do the right thing whether its invoking
 ;; keystroke is from the GUD buffer itself (via major-mode binding)