* term/x-win.el (x-gtk-stock-map):

[gnu-emacs] / lisp / emerge.el

diff --git a/lisp/emerge.el b/lisp/emerge.el
index 48aa07655cf532908b597ebbe4058bd2dd8f55db..ee19351a2e31f2e588f18a1dd30c49d480c8fbd7 100644 (file)
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -94,7 +94,7 @@ but can be invoked directly in `fast' mode.")
   "Return string describing the version of Emerge.
 When called interactively, displays the version."
   (interactive)
-  (if (interactive-p)
+  (if (called-interactively-p 'interactive)
       (message "Emerge version %s" emacs-version)
     emacs-version))
 
@@ -3023,7 +3023,7 @@ If some prefix of KEY has a non-prefix definition, it is redefined."
 ;;    (save-excursion
 ;;      (set-buffer standard-output)
 ;;      (help-mode))
-;;    (print-help-return-message)))
+;;    (help-print-return-message)))
 
 ;; This goes with the redefinition of describe-mode.
 ;;;; Adjust things so that keyboard macro definitions are documented correctly.
@@ -3103,10 +3103,9 @@ SPC, it is ignored; if it is anything else, it is processed as a command."
          (progn
            (erase-buffer)
            (insert name)
-           (if (not (pos-visible-in-window-p))
-               (while (and (not (pos-visible-in-window-p))
-                           (> (1- (frame-height)) (window-height)))
-                 (enlarge-window 1)))
+           (while (and (not (pos-visible-in-window-p))
+                       (not (window-full-height-p)))
+             (enlarge-window 1))
            (let* ((echo-keystrokes 0)
                   (c (read-event)))
              (if (not (eq c 32))