11 files changed, 201 insertions, 134 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a402f88c01..5c3c58767f7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2006-05-04  Karl Chen  <quarl@NOSPAM.quarl.org>
+
+        * progmodes/perl-mode.el (perl-beginning-of-function):
+        Skip anonymous subs.
+
+2006-05-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * ibuffer.el (ibuffer-compressed-file-name-regexp): Avoid loading
+        regexp-opt at run time.
+
+        * term.el (term-handle-ansi-escape): Fix off by one error.
+
+2006-05-04  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-force-update): Delete variable...
+        (gdb-init-1, gdb-post-prompt): ...and references to it.
+        (gdb-frame-handler): Strip directory name from filename if present.
+
+        * progmodes/gud.el (gdb-force-update): Delete defvar
+        (gud-speedbar-buttons): ...and references to it.  Use window-start
+        to try to keep positon in watch expression.
+
+2006-05-03  Richard Stallman  <rms@gnu.org>
+
+        * simple.el (next-history-element, previous-history-element): Doc fix.
+
+        * isearch.el (isearch-update-ring): Doc fix.
+
+2006-05-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * isearch.el (isearch-update-ring): Take history-delete-duplicates
+        into consideration. Replace one arm ifs with whens.
+
 2006-05-03  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gud-watch): Let user select an expression.
@@ -16,20 +49,17 @@
 
 2006-05-02  Chong Yidong  <cyd@mit.edu>
 
-        * msb.el (msb): If EVENT is a down event, read and discard the up
-        event.
+        * msb.el (msb): If EVENT is a down event, read and discard the up event.
 
 2006-05-02  Reiner Steib  <Reiner.Steib@gmx.de>
 
         * startup.el (command-line-1): Refer to Lisp manual when
         pure-space-overflow occurs.
 
-        * files.el (byte-compile-dynamic)
-        (byte-compile-dynamic-docstrings, byte-compile-warnings)
-        (find-file-visit-truename, indent-tabs-mode, left-margin)
-        (no-byte-compile no-update-autoloads, truncate-lines)
-        (version-control): Don't use `t' for safe-local-variable
-        declarations.
+        * files.el (byte-compile-dynamic, byte-compile-dynamic-docstrings)
+        (byte-compile-warnings, find-file-visit-truename, indent-tabs-mode)
+        (left-margin, no-byte-compile, no-update-autoloads, truncate-lines)
+        (version-control): Don't use `t' for safe-local-variable declarations.
 
 2006-05-01  Richard Stallman  <rms@gnu.org>
 
@@ -63,10 +93,10 @@
         Returning "/" only doesn't need to be necessary any longer.
         (tramp-file-name-handler): Make special attention when in hostname
         completion mode.
-        (tramp-completion-file-name-handler): Revert patch from 2006-04-28.
-        (tramp-register-file-name-handlers): Register
-        `tramp-completion-file-name-handler' only when
-        `partial-completion-mode is enabled.
+        (tramp-completion-file-name-handler): Revert patch from 2006-04-28.
+        (tramp-register-file-name-handlers):
+        Register `tramp-completion-file-name-handler' only when
+        `partial-completion-mode' is enabled.
         (tramp-completion-handle-file-name-all-completions):
         Delete directory part from results.
         (tramp-get-completion-methods, tramp-get-completion-user-host):
@@ -80,8 +110,8 @@
 
 2006-05-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-        * term/mac-win.el (mac-ae-open-documents, mac-drag-n-drop): Use
-        select-frame-set-input-focus instead of raise-frame.
+        * term/mac-win.el (mac-ae-open-documents, mac-drag-n-drop):
+        Use select-frame-set-input-focus instead of raise-frame.
         (global-map): Bind M-drag-n-drop to mac-drag-n-drop.
 
 2006-05-01  Nick Roberts  <nickrob@snap.net.nz>
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cecc180f522..7f0f248c7cf 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,24 @@
+2006-05-04  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * mm-decode.el (mm-dissect-buffer): Remove spurious double assignment.
+        (mm-copy-to-buffer): Use with-current-buffer.
+        (mm-display-part): Simplify.
+        (mm-inlinable-p): Add optional arg `type'.
+
+        * gnus-art.el (gnus-mime-view-part-as-type): Add optional PRED
+        argument.
+        (gnus-mime-view-part-externally, gnus-mime-view-part-internally):
+        Try harder to show the attachment internally or externally using
+        gnus-mime-view-part-as-type.
+
+2006-05-04  Reiner Steib  <Reiner.Steib@gmx.de>
+
+        * gnus-art.el (gnus-mime-view-part-as-type-internal): Try to fetch
+        `filename' from Content-Disposition if Content-Type doesn't
+        provide `name'.
+        (gnus-mime-view-part-as-type): Set default instead of
+        initial-input.
+
 2006-04-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * mm-uu.el (mm-uu-pgp-encrypted-extract-1): Assume buffer is made
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 7e3b843d500..208103f805d 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -4317,21 +4317,29 @@ Deleting parts may malfunction or destroy the article; continue? ")
 
 (defun gnus-mime-view-part-as-type-internal ()
   (gnus-article-check-buffer)
-  (let* ((name (mail-content-type-get
-                (mm-handle-type (get-text-property (point) 'gnus-data))
-                'name))
+  (let* ((handle (get-text-property (point) 'gnus-data))
+         (name (or
+                ;; Content-Type: foo/bar; name=...
+                (mail-content-type-get (mm-handle-type handle) 'name)
+                ;; Content-Disposition: attachment; filename=...
+                (cdr (assq 'filename (cdr (mm-handle-disposition handle))))))
          (def-type (and name (mm-default-file-encoding name))))
     (and def-type (cons def-type 0))))
 
-(defun gnus-mime-view-part-as-type (&optional mime-type)
-  "Choose a MIME media type, and view the part as such."
+(defun gnus-mime-view-part-as-type (&optional mime-type pred)
+  "Choose a MIME media type, and view the part as such.
+If non-nil, PRED is a predicate to use during completion to limit the
+available media-types."
   (interactive)
   (unless mime-type
-    (setq mime-type (completing-read
-                     "View as MIME type: "
-                     (mapcar #'list (mailcap-mime-types))
-                     nil nil
-                     (gnus-mime-view-part-as-type-internal))))
+    (setq mime-type
+          (let ((default (gnus-mime-view-part-as-type-internal)))
+            (completing-read
+             (format "View as MIME type (default %s): "
+                     (car default))
+             (mapcar #'list (mailcap-mime-types))
+             pred nil nil nil
+             (car default)))))
   (gnus-article-check-buffer)
   (let ((handle (get-text-property (point) 'gnus-data)))
     (when handle
@@ -4511,12 +4519,18 @@ specified charset."
          (mm-inlined-types nil)
          (mail-parse-charset gnus-newsgroup-charset)
          (mail-parse-ignored-charsets
-          (save-excursion (set-buffer gnus-summary-buffer)
-                          gnus-newsgroup-ignored-charsets)))
-    (when handle
-      (if (mm-handle-undisplayer handle)
-          (mm-remove-part handle)
-        (mm-display-part handle)))))
+          (with-current-buffer gnus-summary-buffer
+            gnus-newsgroup-ignored-charsets))
+         (type (mm-handle-media-type handle))
+         (method (mailcap-mime-info type))
+         (mm-enable-external t))
+    (if (not (stringp method))
+        (gnus-mime-view-part-as-type
+         nil (lambda (type) (stringp (mailcap-mime-info type))))
+      (when handle
+        (if (mm-handle-undisplayer handle)
+            (mm-remove-part handle)
+          (mm-display-part handle))))))
 
 (defun gnus-mime-view-part-internally (&optional handle)
   "View the MIME part under point with an internal viewer.
@@ -4528,13 +4542,16 @@ If no internal viewer is available, use an external viewer."
          (mm-inline-large-images t)
          (mail-parse-charset gnus-newsgroup-charset)
          (mail-parse-ignored-charsets
-          (save-excursion (set-buffer gnus-summary-buffer)
-                          gnus-newsgroup-ignored-charsets))
+          (with-current-buffer gnus-summary-buffer
+            gnus-newsgroup-ignored-charsets))
          (inhibit-read-only t))
-    (when handle
-      (if (mm-handle-undisplayer handle)
-          (mm-remove-part handle)
-        (mm-display-part handle)))))
+    (if (not (mm-inlinable-p handle))
+        (gnus-mime-view-part-as-type
+         nil (lambda (type) (mm-inlinable-p handle type)))
+      (when handle
+        (if (mm-handle-undisplayer handle)
+            (mm-remove-part handle)
+          (mm-display-part handle))))))
 
 (defun gnus-mime-action-on-part (&optional action)
   "Do something with the MIME attachment at \(point\)."
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index b79e081f0e1..c5fd5d3c258 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -562,7 +562,7 @@ Postpone undisplaying of viewers for types in
            description)
         (setq type (split-string (car ctl) "/"))
         (setq subtype (cadr type)
-              type (pop type))
+              type (car type))
         (setq
          result
          (cond
@@ -641,16 +641,15 @@ Postpone undisplaying of viewers for types in
 
 (defun mm-copy-to-buffer ()
   "Copy the contents of the current buffer to a fresh buffer."
-  (save-excursion
     (let ((obuf (current-buffer))
           beg)
       (goto-char (point-min))
       (search-forward-regexp "^\n" nil t)
       (setq beg (point))
-      (set-buffer
+    (with-current-buffer
        ;; Preserve the data's unibyteness (for url-insert-file-contents).
        (let ((default-enable-multibyte-characters (mm-multibyte-p)))
-         (generate-new-buffer " *mm*")))
+          (generate-new-buffer " *mm*"))
       (insert-buffer-substring obuf beg)
       (current-buffer))))
 
@@ -701,7 +700,8 @@ external if displayed external."
                   (forward-line 1)
                   (mm-insert-inline handle (mm-get-part handle))
                   'inline)
-              (if (and method ;; If nil, we always use "save".
+              (setq external
+                    (and method ;; If nil, we always use "save".
                        (stringp method) ;; 'mailcap-save-binary-file
                        (or (eq mm-enable-external t)
                            (and (eq mm-enable-external 'ask)
@@ -714,9 +714,7 @@ external if displayed external."
                                       (concat
                                        " \"" (format method filename) "\"")
                                     "")
-                                  "? ")))))
-                  (setq external t)
-                (setq external nil))
+                                    "? "))))))
               (if external
                   (mm-display-external
                    handle (or method 'mailcap-save-binary-file))
@@ -1019,10 +1017,12 @@ external if displayed external."
               methods nil)))
     result))
 
-(defun mm-inlinable-p (handle)
-  "Say whether HANDLE can be displayed inline."
+(defun mm-inlinable-p (handle &optional type)
+  "Say whether HANDLE can be displayed inline.
+TYPE is the mime-type of the object; it defaults to the one given
+in HANDLE."
+  (unless type (setq type (mm-handle-media-type handle)))
   (let ((alist mm-inline-media-tests)
-        (type (mm-handle-media-type handle))
         test)
     (while alist
       (when (string-match (caar alist) type)
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 0a84f9b0c82..4b1069b26c1 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -324,13 +324,14 @@ directory, like `default-directory'."
   :type '(repeat function)
   :group 'ibuffer)
 
+(eval-when-compile 
 (defcustom ibuffer-compressed-file-name-regexp
-  (concat "\\.\\("
-        (regexp-opt '("arj" "bgz" "bz2" "gz" "lzh" "taz" "tgz" "zip" "z"))
-        "\\)$")
+    (concat "\\.\\("
+            (regexp-opt '("arj" "bgz" "bz2" "gz" "lzh" "taz" "tgz" "zip" "z"))
+            "\\)$")
   "Regexp to match compressed file names."
   :type 'regexp
-  :group 'ibuffer)
+  :group 'ibuffer))
 
 (defcustom ibuffer-hook nil
   "Hook run when `ibuffer' is called."
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 13b54a02467..78b523f3845 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -830,21 +830,22 @@ NOPUSH is t and EDIT is t."
 
 (defun isearch-update-ring (string &optional regexp)
   "Add STRING to the beginning of the search ring.
-REGEXP says which ring to use."
+REGEXP if non-nil says use the regexp search ring."
   (if regexp
-      (if (or (null regexp-search-ring)
-              (not (string= string (car regexp-search-ring))))
-          (progn
-            (push string regexp-search-ring)
-            (if (> (length regexp-search-ring) regexp-search-ring-max)
-                (setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
-                        nil))))
-    (if (or (null search-ring)
-            (not (string= string (car search-ring))))
-        (progn
-          (push string search-ring)
-          (if (> (length search-ring) search-ring-max)
-              (setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
+      (when (or (null regexp-search-ring)
+                (not (string= string (car regexp-search-ring))))
+        (when history-delete-duplicates
+          (setq regexp-search-ring (delete string regexp-search-ring)))
+        (push string regexp-search-ring)
+        (when (> (length regexp-search-ring) regexp-search-ring-max)
+          (setcdr (nthcdr (1- search-ring-max) regexp-search-ring) nil)))
+    (when (or (null search-ring)
+              (not (string= string (car search-ring))))
+      (when history-delete-duplicates
+        (setq search-ring (delete string search-ring)))
+      (push string search-ring)
+      (when (> (length search-ring) search-ring-max)
+        (setcdr (nthcdr (1- search-ring-max) search-ring) nil)))))
 
 ;; Switching buffers should first terminate isearch-mode.
 ;; ;; For Emacs 19, the frame switch event is handled.
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 4b3202c6e41..28fcb70bb8b 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -114,8 +114,6 @@ Set to \"main\" at start if gdb-show-main is t.")
 Each element has the form (VARNUM EXPRESSION NUMCHILD TYPE VALUE STATUS FP)
 where STATUS is nil (unchanged), `changed' or `out-of-scope', FP the frame
 address for root variables.")
-(defvar gdb-force-update t
- "Non-nil means that view of watch expressions will be updated in the speedbar.")
 (defvar gdb-main-file nil "Source file from which program execution begins.")
 (defvar gdb-overlay-arrow-position nil)
 (defvar gdb-server-prefix nil)
@@ -527,7 +525,6 @@ With arg, use separate IO iff arg is positive."
         gdb-current-language nil
         gdb-frame-number nil
         gdb-var-list nil
-        gdb-force-update t
         gdb-main-file nil
         gdb-first-post-prompt t
         gdb-prompting nil
@@ -1381,7 +1378,6 @@ happens to be appropriate."
       ;; FIXME: with GDB-6 on Darwin, this might very well work.
       ;; Only needed/used with speedbar/watch expressions.
       (when (and (boundp 'speedbar-frame) (frame-live-p speedbar-frame))
-        (setq gdb-force-update t)
         (if (string-equal gdb-version "pre-6.4")
             (gdb-var-update)
           (gdb-var-update-1)))))
@@ -3166,7 +3162,9 @@ BUFFER nil or omitted means use the current buffer."
     (if (and (match-string 3) gud-overlay-arrow-position)
       (let ((buffer (marker-buffer gud-overlay-arrow-position))
             (position (marker-position gud-overlay-arrow-position)))
-        (when (and buffer (string-equal (buffer-name buffer) (match-string 3)))
+        (when (and buffer
+                   (string-equal (buffer-name buffer)
+                                 (file-name-nondirectory (match-string 3))))
           (with-current-buffer buffer
             (setq fringe-indicator-alist
                   (if (string-equal gdb-frame-number "0")
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 11259aa3965..5be88668353 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -49,7 +49,6 @@
 (defvar gdb-macro-info)
 (defvar gdb-server-prefix)
 (defvar gdb-show-changed-values)
-(defvar gdb-force-update)
 (defvar gdb-var-list)
 (defvar gdb-speedbar-auto-raise)
 (defvar tool-bar-map)
@@ -442,37 +441,55 @@ required by the caller."
              (buffer-name gud-comint-buffer))
     (let* ((minor-mode (with-current-buffer buffer gud-minor-mode))
           (window (get-buffer-window (current-buffer) 0))
+          (start (window-start window))
           (p (window-point window)))
       (cond
        ((memq minor-mode '(gdbmi gdba))
-        (when (or gdb-force-update
-                  (not (save-excursion
-                         (goto-char (point-min))
-                         (looking-at "Watch Expressions:"))))
-          (erase-buffer)
-          (insert "Watch Expressions:\n")
-          (if gdb-speedbar-auto-raise
-              (raise-frame speedbar-frame))
-          (let ((var-list gdb-var-list) parent)
-            (while var-list
-              (let* (char (depth 0) (start 0) (var (car var-list))
-                          (varnum (car var)) (expr (nth 1 var))
-                          (type (nth 3 var)) (value (nth 4 var))
-                          (status (nth 5 var)))
-                (put-text-property
-                 0 (length expr) 'face font-lock-variable-name-face expr)
-                (put-text-property
-                 0 (length type) 'face font-lock-type-face type)
-                (while (string-match "\\." varnum start)
-                  (setq depth (1+ depth)
-                        start (1+ (match-beginning 0))))
-                (if (eq depth 0) (setq parent nil))
-                (if (or (equal (nth 2 var) "0")
-                        (and (equal (nth 2 var) "1")
-                             (string-match "char \\*$" type)))
+        (erase-buffer)
+        (insert "Watch Expressions:\n")
+        (if gdb-speedbar-auto-raise
+            (raise-frame speedbar-frame))
+        (let ((var-list gdb-var-list) parent)
+          (while var-list
+            (let* (char (depth 0) (start 0) (var (car var-list))
+                        (varnum (car var)) (expr (nth 1 var))
+                        (type (nth 3 var)) (value (nth 4 var))
+                        (status (nth 5 var)))
+              (put-text-property
+               0 (length expr) 'face font-lock-variable-name-face expr)
+              (put-text-property
+               0 (length type) 'face font-lock-type-face type)
+              (while (string-match "\\." varnum start)
+                (setq depth (1+ depth)
+                      start (1+ (match-beginning 0))))
+              (if (eq depth 0) (setq parent nil))
+              (if (or (equal (nth 2 var) "0")
+                      (and (equal (nth 2 var) "1")
+                           (string-match "char \\*$" type)))
+                  (speedbar-make-tag-line
+                   'bracket ?? nil nil
+                   (concat expr "\t" value)
+                   (if (or parent (eq status 'out-of-scope))
+                       nil 'gdb-edit-value)
+                   nil
+                   (if gdb-show-changed-values
+                       (or parent (case status
+                                    (changed 'font-lock-warning-face)
+                                    (out-of-scope 'shadow)
+                                    (t t)))
+                     t)
+                   depth)
+                (if (eq status 'out-of-scope) (setq parent 'shadow))
+                (if (and (nth 1 var-list)
+                         (string-match (concat varnum "\\.")
+                                       (car (nth 1 var-list))))
+                    (setq char ?-)
+                  (setq char ?+))
+                (if (string-match "\\*$" type)
                     (speedbar-make-tag-line
-                     'bracket ?? nil nil
-                     (concat expr "\t" value)
+                     'bracket char
+                     'gdb-speedbar-expand-node varnum
+                     (concat expr "\t" type "\t" value)
                      (if (or parent (eq status 'out-of-scope))
                          nil 'gdb-edit-value)
                      nil
@@ -483,37 +500,15 @@ required by the caller."
                                       (t t)))
                        t)
                      depth)
-                  (if (eq status 'out-of-scope) (setq parent 'shadow))
-                  (if (and (nth 1 var-list)
-                           (string-match (concat varnum "\\.")
-                                         (car (nth 1 var-list))))
-                      (setq char ?-)
-                    (setq char ?+))
-                  (if (string-match "\\*$" type)
-                      (speedbar-make-tag-line
-                       'bracket char
-                       'gdb-speedbar-expand-node varnum
-                       (concat expr "\t" type "\t" value)
-                       (if (or parent (eq status 'out-of-scope))
-                         nil 'gdb-edit-value)
-                       nil
-                       (if gdb-show-changed-values
-                           (or parent (case status
-                                            (changed 'font-lock-warning-face)
-                                            (out-of-scope 'shadow)
-                                            (t t)))
-                         t)
-                       depth)
-                    (speedbar-make-tag-line
-                     'bracket char
-                     'gdb-speedbar-expand-node varnum
-                     (concat expr "\t" type)
-                     nil nil
-                     (if (and (or parent status) gdb-show-changed-values)
-                         'shadow t)
-                     depth))))
-              (setq var-list (cdr var-list))))
-          (setq gdb-force-update nil)))
+                  (speedbar-make-tag-line
+                   'bracket char
+                   'gdb-speedbar-expand-node varnum
+                   (concat expr "\t" type)
+                   nil nil
+                   (if (and (or parent status) gdb-show-changed-values)
+                       'shadow t)
+                   depth))))
+            (setq var-list (cdr var-list)))))
        (t (unless (and (save-excursion
                          (goto-char (point-min))
                          (looking-at "Current Stack:"))
@@ -544,6 +539,7 @@ required by the caller."
                        (t (error "Should never be here")))
                  frame t))))
             (setq gud-last-speedbar-stackframe gud-last-last-frame))))
+      (set-window-start window start)
       (set-window-point window p))))
 
 
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index e92bb1053a6..950e0cba06f 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -923,8 +923,9 @@ Returns new value of point in all cases."
   (or arg (setq arg 1))
   (if (< arg 0) (forward-char 1))
   (and (/= arg 0)
-       (re-search-backward "^\\s(\\|^\\s-*sub\\b[^{]+{\\|^\\s-*format\\b[^=]*=\\|^\\."
-                           nil 'move arg)
+       (re-search-backward
+        "^\\s(\\|^\\s-*sub\\b[ \t\n]*\\_<[^{]+{\\|^\\s-*format\\b[^=]*=\\|^\\."
+        nil 'move arg)
        (goto-char (1- (match-end 0))))
   (point))
 
diff --git a/lisp/simple.el b/lisp/simple.el
index bf620c2533d..bd8a9d1a284 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1269,7 +1269,8 @@ makes the search case-sensitive."
 (defvar minibuffer-temporary-goal-position nil)
 
 (defun next-history-element (n)
-  "Insert the next element of the minibuffer history into the minibuffer."
+  "Puts next element of the minibuffer history in the minibuffer.
+With argument N, it uses the Nth following element."
   (interactive "p")
   (or (zerop n)
       (let ((narg (- minibuffer-history-position n))
@@ -1312,7 +1313,8 @@ makes the search case-sensitive."
         (goto-char (or minibuffer-temporary-goal-position (point-max))))))
 
 (defun previous-history-element (n)
-  "Inserts the previous element of the minibuffer history into the minibuffer."
+  "Puts previous element of the minibuffer history in the minibuffer.
+With argument N, it uses the Nth previous element."
   (interactive "p")
   (next-history-element (- n)))
 
diff --git a/lisp/term.el b/lisp/term.el
index be4aefaba72..a03970a368b 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -3320,7 +3320,7 @@ See `term-prompt-regexp'."
    ((eq char ?r)
     (term-set-scroll-region
      (1- term-terminal-previous-parameter)
-     term-terminal-parameter))
+     (1- term-terminal-parameter)))
    (t)))
 
 (defun term-set-scroll-region (top bottom)