Merge from trunk.

15 files changed, 195 insertions, 128 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f61812f7e1a..22ff12fe6b4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,85 @@
+2013-12-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/smie.el (smie-indent--hanging-p): Don't bother matching
+        comment-start-skip, since it fails when that uses submatch 1 (bug#16041).
+
+        * emulation/cua-base.el (cua-paste): Add `delete-selection' property
+        instead of deleting the selection "by hand" (bug#16098).
+        Rely on insert-for-yank to yank rectangles.
+        (cua-highlight-region-shift-only): Mark obsolete.
+        (cua-mode): Don't enable/disable transient-mark-mode,
+        shift-select-mode (cua-mode works both with and without them), and
+        pc-selection-mode (obsolete).
+        * emulation/cua-rect.el (cua--activate-rectangle): Activate the mark.
+        (cua--deactivate-rectangle): Deactivate it.
+
+        * delsel.el (delete-selection-mode): Don't enable transient-mark-mode.
+        (delete-selection-helper): Make sure yank starts at the top of the
+        deleted region.
+        (minibuffer-keyboard-quit): Use region-active-p.
+
+        * emacs-lisp/trace.el (trace-make-advice): Don't deactivate the mark.
+
+        * simple.el (normal-erase-is-backspace-mode): Map kp-delete identically
+        to `delete' (bug#16109).
+
+2013-12-11  Rüdiger Sonderfeld  <ruediger@c-plusplus.de>
+
+        * progmodes/octave.el (octave-mode, inferior-octave-mode): Link to
+        info manual and show keybindings and set `:group' keyword.
+
+2013-12-11  Juri Linkov  <juri@jurta.org>
+
+        * delsel.el (delete-active-region): Let-bind `this-command'
+        to prevent `kill-region' from changing its original value.
+        (delete-selection-helper): Handle `overwrite-mode' for the type
+        `kill' exactly the same way as for the type `t'.
+        (insert-char, quoted-insert, reindent-then-newline-and-indent):
+        Support more commands.  (Bug#13312)
+
+2013-12-11  Juri Linkov  <juri@jurta.org>
+
+        * bindings.el: Map kp keys to non-kp keys systematically
+        with basic modifiers control, meta and shift.  (Bug#14397)
+
+2013-12-11  Kenjiro NAKAYAMA <nakayamakenjiro@gmail.com>  (tiny change)
+
+        * net/eww.el (eww-mode-map): Instead of "Quit" show "Exit" and
+        "Close browser" menu items.  Fix wrong function of "List
+        bookmarks".
+
+2013-12-11  Juri Linkov  <juri@jurta.org>
+
+        * misearch.el (multi-isearch-buffers): Set the value of
+        `multi-isearch-buffer-list' globally.  Set NO-RECURSIVE-EDIT
+        arg of isearch-forward to t.
+        (multi-isearch-buffers-regexp): Set the value of
+        `multi-isearch-buffer-list' globally.  Set NO-RECURSIVE-EDIT
+        arg of isearch-forward-regexp to t.
+        (multi-isearch-files): Set the value of
+        `multi-isearch-file-list' globally.  Set NO-RECURSIVE-EDIT
+        arg of isearch-forward to t.
+        (multi-isearch-files-regexp): Set the value of
+        `multi-isearch-file-list globally.  Set NO-RECURSIVE-EDIT
+        arg of isearch-forward-regexp to t.  (Bug#16035)
+
+        * dired-aux.el (dired-isearch-filenames): Set NO-RECURSIVE-EDIT
+        arg of isearch-forward to t.
+        (dired-isearch-filenames-regexp): Set NO-RECURSIVE-EDIT
+        arg of isearch-forward-regexp to t.
+        (dired-isearch-filter-filenames): Remove unnecessary check for
+        `dired-isearch-filenames'.
+
+        * comint.el (comint-history-isearch-backward):
+        Set NO-RECURSIVE-EDIT arg of isearch-backward to t.
+        (comint-history-isearch-backward-regexp):
+        Set NO-RECURSIVE-EDIT arg of isearch-backward-regexp to t.
+
+2013-12-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * Makefile.in (autoloads): Run $(srcdir)/loaddefs.el through
+        unmsys--file-name.  (Bug#16099)
+
 2013-12-10  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * emacs-lisp/package.el (package-keyword-button-action): Remove
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 9c9eacfd386..3675cd90e46 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -183,7 +183,7 @@ autoloads: $(LOADDEFS) doit
         echo Directories: $$wins; \
         $(emacs) -l autoload \
             --eval '(setq autoload-builtin-package-versions t)' \
-            --eval '(setq generated-autoload-file (expand-file-name "$(srcdir)/loaddefs.el"))' \
+            --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
             -f batch-update-autoloads $$wins
 
 # This is required by the bootstrap-emacs target in ../src/Makefile, so
diff --git a/lisp/bindings.el b/lisp/bindings.el
index b3b4f76b555..c159f44eecd 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1056,36 +1056,30 @@ if `inhibit-field-text-motion' is non-nil."
 ;; FIXME: rather than list such mappings for every modifier-combination,
 ;;   we should come up with a way to do it generically, something like
 ;;   (define-key function-key-map [*-kp-home] [*-home])
-(define-key function-key-map [kp-home] [home])
-(define-key function-key-map [kp-left] [left])
-(define-key function-key-map [kp-up] [up])
-(define-key function-key-map [kp-right] [right])
-(define-key function-key-map [kp-down] [down])
-(define-key function-key-map [kp-prior] [prior])
-(define-key function-key-map [kp-next] [next])
-(define-key function-key-map [M-kp-next] [M-next])
-(define-key function-key-map [kp-end] [end])
-(define-key function-key-map [kp-begin] [begin])
-(define-key function-key-map [kp-insert] [insert])
+;; Currently we add keypad key combinations with basic modifiers
+;; (to complement plain bindings in "Keypad support" section in simple.el)
+;; Until [*-kp-home] is implemented, for more modifiers we could also use:
+;; (todo-powerset '(control meta shift hyper super alt))  (Bug#14397)
+(let ((modifiers '(nil (control) (meta) (control meta) (shift)
+                   (control shift) (meta shift) (control meta shift)))
+      (keys '((kp-delete delete) (kp-insert insert)
+              (kp-end end) (kp-down down) (kp-next next)
+              (kp-left left) (kp-begin begin) (kp-right right)
+              (kp-home home) (kp-up up) (kp-prior prior)
+              (kp-enter enter) (kp-decimal ?.)
+              (kp-0 ?0) (kp-1 ?1) (kp-2 ?2) (kp-3 ?3) (kp-4 ?4)
+              (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9)
+              (kp-add +) (kp-subtract -) (kp-multiply *) (kp-divide /))))
+  (dolist (pair keys)
+    (dolist (mod modifiers)
+      (define-key function-key-map
+        (vector (append mod (list (nth 0 pair))))
+        (vector (append mod (list (nth 1 pair))))))))
+
 (define-key function-key-map [backspace] [?\C-?])
 (define-key function-key-map [delete] [?\C-?])
 (define-key function-key-map [kp-delete] [?\C-?])
-(define-key function-key-map [S-kp-end] [S-end])
-(define-key function-key-map [S-kp-down] [S-down])
-(define-key function-key-map [S-kp-next] [S-next])
-(define-key function-key-map [S-kp-left] [S-left])
-(define-key function-key-map [S-kp-right] [S-right])
-(define-key function-key-map [S-kp-home] [S-home])
-(define-key function-key-map [S-kp-up] [S-up])
-(define-key function-key-map [S-kp-prior] [S-prior])
-(define-key function-key-map [C-S-kp-end] [C-S-end])
-(define-key function-key-map [C-S-kp-down] [C-S-down])
-(define-key function-key-map [C-S-kp-next] [C-S-next])
-(define-key function-key-map [C-S-kp-left] [C-S-left])
-(define-key function-key-map [C-S-kp-right] [C-S-right])
-(define-key function-key-map [C-S-kp-home] [C-S-home])
-(define-key function-key-map [C-S-kp-up] [C-S-up])
-(define-key function-key-map [C-S-kp-prior] [C-S-prior])
+
 ;; Don't bind shifted keypad numeric keys, they reportedly
 ;; interfere with the feature of some keyboards to produce
 ;; numbers when NumLock is off.
@@ -1097,14 +1091,14 @@ if `inhibit-field-text-motion' is non-nil."
 ;(define-key function-key-map [S-kp-7] [S-home])
 ;(define-key function-key-map [S-kp-8] [S-up])
 ;(define-key function-key-map [S-kp-9] [S-prior])
-(define-key function-key-map [C-S-kp-1] [C-S-end])
-(define-key function-key-map [C-S-kp-2] [C-S-down])
-(define-key function-key-map [C-S-kp-3] [C-S-next])
-(define-key function-key-map [C-S-kp-4] [C-S-left])
-(define-key function-key-map [C-S-kp-6] [C-S-right])
-(define-key function-key-map [C-S-kp-7] [C-S-home])
-(define-key function-key-map [C-S-kp-8] [C-S-up])
-(define-key function-key-map [C-S-kp-9] [C-S-prior])
+;(define-key function-key-map [C-S-kp-1] [C-S-end])
+;(define-key function-key-map [C-S-kp-2] [C-S-down])
+;(define-key function-key-map [C-S-kp-3] [C-S-next])
+;(define-key function-key-map [C-S-kp-4] [C-S-left])
+;(define-key function-key-map [C-S-kp-6] [C-S-right])
+;(define-key function-key-map [C-S-kp-7] [C-S-home])
+;(define-key function-key-map [C-S-kp-8] [C-S-up])
+;(define-key function-key-map [C-S-kp-9] [C-S-prior])
 
 ;; Hitting C-SPC on text terminals, usually sends the ascii code 0 (aka C-@),
 ;; so we can't distinguish those two keys, but usually we consider C-SPC
diff --git a/lisp/comint.el b/lisp/comint.el
index afd93fc6ff0..08e8b162771 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1407,13 +1407,13 @@ If nil, Isearch operates on the whole comint buffer."
   "Search for a string backward in input history using Isearch."
   (interactive)
   (let ((comint-history-isearch t))
-    (isearch-backward)))
+    (isearch-backward nil t)))
 
 (defun comint-history-isearch-backward-regexp ()
   "Search for a regular expression backward in input history using Isearch."
   (interactive)
   (let ((comint-history-isearch t))
-    (isearch-backward-regexp)))
+    (isearch-backward-regexp nil t)))
 
 (defvar-local comint-history-isearch-message-overlay nil)
 
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 3c9a6561cde..87e84e59dee 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -71,14 +71,15 @@ any selection."
   :global t :group 'editing-basics
   (if (not delete-selection-mode)
       (remove-hook 'pre-command-hook 'delete-selection-pre-hook)
-    (add-hook 'pre-command-hook 'delete-selection-pre-hook)
-    (transient-mark-mode t)))
+    (add-hook 'pre-command-hook 'delete-selection-pre-hook)))
 
 (defun delete-active-region (&optional killp)
   "Delete the active region.
 If KILLP in not-nil, the active region is killed instead of deleted."
   (if killp
-      (kill-region (point) (mark) t)
+      ;; Don't allow `kill-region' to change the value of `this-command'.
+      (let (this-command)
+        (kill-region (point) (mark) t))
     (funcall region-extract-function 'delete-only))
   t)
 
@@ -102,7 +103,13 @@ If KILLP in not-nil, the active region is killed instead of deleted."
      FUNCTION should take no argument and return one of the above values or nil."
   (condition-case data
       (cond ((eq type 'kill)
-             (delete-active-region t))
+             (delete-active-region t)
+             (if (and overwrite-mode
+                      (eq this-command 'self-insert-command))
+                 (let ((overwrite-mode nil))
+                   (self-insert-command
+                    (prefix-numeric-value current-prefix-arg))
+                   (setq this-command 'ignore))))
             ((eq type 'yank)
              ;; Before a yank command, make sure we don't yank the
              ;; head of the kill-ring that really comes from the
@@ -114,7 +121,11 @@ If KILLP in not-nil, the active region is killed instead of deleted."
                         (fboundp 'mouse-region-match)
                         (mouse-region-match))
                (current-kill 1))
-             (delete-active-region))
+             (let ((pos (copy-marker (region-beginning))))
+               (delete-active-region)
+               ;; If the region was, say, rectangular, make sure we yank
+               ;; from the top, to "replace".
+               (goto-char pos)))
             ((eq type 'supersede)
              (let ((empty-region (= (point) (mark))))
                (delete-active-region)
@@ -165,10 +176,14 @@ See `delete-selection-helper'."
        (not (run-hook-with-args-until-success
              'self-insert-uses-region-functions))))
 
+(put 'insert-char 'delete-selection t)
+(put 'quoted-insert 'delete-selection t)
+
 (put 'yank 'delete-selection 'yank)
 (put 'clipboard-yank 'delete-selection 'yank)
 (put 'insert-register 'delete-selection t)
 
+(put 'reindent-then-newline-and-indent 'delete-selection t)
 (put 'newline-and-indent 'delete-selection t)
 (put 'newline 'delete-selection t)
 (put 'open-line 'delete-selection 'kill)
@@ -180,7 +195,7 @@ See `delete-selection-helper'."
 In Delete Selection mode, if the mark is active, just deactivate it;
 then it takes a second \\[keyboard-quit] to abort the minibuffer."
   (interactive)
-  (if (and delete-selection-mode transient-mark-mode mark-active)
+  (if (and delete-selection-mode (region-active-p))
       (setq deactivate-mark t)
     (abort-recursive-edit)))
 
@@ -197,9 +212,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
   (define-key minibuffer-local-completion-map "\C-g" 'abort-recursive-edit)
   (define-key minibuffer-local-must-match-map "\C-g" 'abort-recursive-edit)
   (define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit)
-  (dolist (sym '(self-insert-command yank clipboard-yank
-                 insert-register
-                 newline-and-indent newline open-line))
+  (dolist (sym '(self-insert-command insert-char quoted-insert yank
+                 clipboard-yank insert-register newline-and-indent
+                 reindent-then-newline-and-indent newline open-line))
     (put sym 'delete-selection nil))
   ;; continue standard unloading
   nil)
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 31d0495175a..28bfb283717 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -2526,24 +2526,22 @@ Intended to be added to `isearch-mode-hook'."
   "Test whether the current search hit is a file name.
 Return non-nil if the text from BEG to END is part of a file
 name (has the text property `dired-filename')."
-  (if dired-isearch-filenames
-      (text-property-not-all (min beg end) (max beg end)
-                             'dired-filename nil)
-    t))
+  (text-property-not-all (min beg end) (max beg end)
+                         'dired-filename nil))
 
 ;;;###autoload
 (defun dired-isearch-filenames ()
   "Search for a string using Isearch only in file names in the Dired buffer."
   (interactive)
   (let ((dired-isearch-filenames t))
-    (isearch-forward)))
+    (isearch-forward nil t)))
 
 ;;;###autoload
 (defun dired-isearch-filenames-regexp ()
   "Search for a regexp using Isearch only in file names in the Dired buffer."
   (interactive)
   (let ((dired-isearch-filenames t))
-    (isearch-forward-regexp)))
+    (isearch-forward-regexp nil t)))
 
 
 ;; Functions for searching in tags style among marked files.
diff --git a/lisp/dired.el b/lisp/dired.el
index 27327352afb..afd9fbca5c2 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3849,7 +3849,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 
 ;;; Start of automatically extracted autoloads.
 
-;;;### (autoloads nil "dired-aux" "dired-aux.el" "04b4cb6bde3220f55574eb1d99ac0d29")
+;;;### (autoloads nil "dired-aux" "dired-aux.el" "4cb9d594789dacdf2445f338b9189357")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index f025a8b400b..1c468e013d6 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -1165,7 +1165,7 @@ the beginning of a line."
                     (forward-char 1))
                (skip-chars-forward " \t")
                (or (eolp)
-                   (and (looking-at comment-start-skip)
+                   (and ;; (looking-at comment-start-skip) ;(bug#16041).
                         (forward-comment (point-max))))
                (point))))))
 
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index f605c2865c0..3a2c44a8da6 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -222,6 +222,7 @@ be printed along with the arguments in the trace."
   (lambda (body &rest args)
     (let ((trace-level (1+ trace-level))
           (trace-buffer (get-buffer-create buffer))
+          (deactivate-mark nil)         ;Protect deactivate-mark.
           (ctx (funcall context)))
       (unless inhibit-trace
         (with-current-buffer trace-buffer
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 6c891c10eed..24149a33c89 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -294,6 +294,8 @@ But when the mark was set using \\[cua-set-mark], Transient Mark mode
 is not turned on."
   :type 'boolean
   :group 'cua)
+(make-obsolete-variable 'cua-highlight-region-shift-only
+                        'transient-mark-mode "24.4")
 
 (defcustom cua-prefix-override-inhibit-delay 0.2
   "If non-nil, time in seconds to delay before overriding prefix key.
@@ -858,6 +860,7 @@ With numeric prefix arg, copy to register 0-9 instead."
 
 (declare-function x-clipboard-yank "../term/x-win" ())
 
+(put 'cua-paste 'delete-selection 'yank)
 (defun cua-paste (arg)
   "Paste last cut or copied region or rectangle.
 An active region is deleted before executing the command.
@@ -866,8 +869,7 @@ If global mark is active, copy from register or one character."
   (interactive "P")
   (setq arg (cua--prefix-arg arg))
   (let ((regtxt (and cua--register (get-register cua--register)))
-        (count (prefix-numeric-value arg))
-        paste-column paste-lines)
+        (count (prefix-numeric-value arg)))
     (cond
      ((and cua--register (not regtxt))
       (message "Nothing in register %c" cua--register))
@@ -875,30 +877,12 @@ If global mark is active, copy from register or one character."
       (if regtxt
           (cua--insert-at-global-mark regtxt)
         (when (not (eobp))
-          (cua--insert-at-global-mark (filter-buffer-substring (point) (+ (point) count)))
+          (cua--insert-at-global-mark
+           (filter-buffer-substring (point) (+ (point) count)))
           (forward-char count))))
      (buffer-read-only
       (error "Cannot paste into a read-only buffer"))
      (t
-      ;; Must save register here, since delete may override reg 0.
-      (if mark-active
-          (if cua--rectangle
-              (progn
-                (goto-char (min (mark) (point)))
-                (setq paste-column (cua--rectangle-left))
-                (setq paste-lines (cua--delete-rectangle))
-                (if (= paste-lines 1)
-                    (setq paste-lines nil))) ;; paste all
-            ;; Before a yank command, make sure we don't yank the
-            ;; head of the kill-ring that really comes from the
-            ;; currently active region we are going to delete.
-            ;; That would make yank a no-op.
-            (if (and (string= (filter-buffer-substring (point) (mark))
-                              (car kill-ring))
-                     (fboundp 'mouse-region-match)
-                     (mouse-region-match))
-                (current-kill 1))
-            (cua-delete-region)))
       (cond
        (regtxt
         (cond
@@ -906,16 +890,6 @@ If global mark is active, copy from register or one character."
          ((consp regtxt) (cua--insert-rectangle regtxt))
          ((stringp regtxt) (insert-for-yank regtxt))
          (t (message "Unknown data in register %c" cua--register))))
-       ((and cua--last-killed-rectangle
-             (eq (and kill-ring (car kill-ring)) (car cua--last-killed-rectangle)))
-        (let ((pt (point)))
-          (when (not (eq buffer-undo-list t))
-            (setq this-command 'cua--paste-rectangle)
-            (undo-boundary)
-            (setq buffer-undo-list (cons pt buffer-undo-list)))
-          (cua--insert-rectangle (cdr cua--last-killed-rectangle)
-                                 nil paste-column paste-lines)
-          (if arg (goto-char pt))))
        ((eq this-original-command 'clipboard-yank)
         (clipboard-yank))
        ((eq this-original-command 'x-clipboard-yank)
@@ -1426,9 +1400,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
 
 ;; State prior to enabling cua-mode
 ;; Value is a list with the following elements:
-;;   transient-mark-mode
 ;;   delete-selection-mode
-;;   pc-selection-mode
 
 (defvar cua--saved-state nil)
 
@@ -1488,7 +1460,8 @@ shifted movement key, set `cua-highlight-region-shift-only'."
     (remove-hook 'post-command-hook 'cua--post-command-handler))
 
   (if (not cua-mode)
-      (setq emulation-mode-map-alists (delq 'cua--keymap-alist emulation-mode-map-alists))
+      (setq emulation-mode-map-alists
+            (delq 'cua--keymap-alist emulation-mode-map-alists))
     (add-to-ordered-list 'emulation-mode-map-alists 'cua--keymap-alist 400)
     (cua--select-keymaps))
 
@@ -1496,34 +1469,21 @@ shifted movement key, set `cua-highlight-region-shift-only'."
    (cua-mode
     (setq cua--saved-state
           (list
-           transient-mark-mode
-           (and (boundp 'delete-selection-mode) delete-selection-mode)
-           (and (boundp 'pc-selection-mode) pc-selection-mode)
-           shift-select-mode))
+           (and (boundp 'delete-selection-mode) delete-selection-mode)))
     (if cua-delete-selection
         (delete-selection-mode 1)
       (if (and (boundp 'delete-selection-mode) delete-selection-mode)
           (delete-selection-mode -1)))
-    (if (and (boundp 'pc-selection-mode) pc-selection-mode)
-        (pc-selection-mode -1))
-    (cua--deactivate)
-    (setq shift-select-mode t)
-    (transient-mark-mode (if cua-highlight-region-shift-only -1 1)))
+    (if cua-highlight-region-shift-only (transient-mark-mode -1))
+    (cua--deactivate))
    (cua--saved-state
-    (setq transient-mark-mode (car cua--saved-state))
-    (if (nth 1 cua--saved-state)
+    (if (nth 0 cua--saved-state)
         (delete-selection-mode 1)
       (if (and (boundp 'delete-selection-mode) delete-selection-mode)
           (delete-selection-mode -1)))
-    (if (nth 2 cua--saved-state)
-        (pc-selection-mode 1))
-    (setq shift-select-mode (nth 3 cua--saved-state))
     (if (called-interactively-p 'interactive)
-        (message "CUA mode disabled.%s%s%s%s"
-                 (if (nth 1 cua--saved-state) " Delete-Selection" "")
-                 (if (and (nth 1 cua--saved-state) (nth 2 cua--saved-state)) " and" "")
-                 (if (nth 2 cua--saved-state) " PC-Selection" "")
-                 (if (or (nth 1 cua--saved-state) (nth 2 cua--saved-state)) " enabled" "")))
+        (message "CUA mode disabled.%s"
+                 (if (nth 0 cua--saved-state) " Delete-Selection enabled" "")))
     (setq cua--saved-state nil))))
 
 
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 8941bf27de7..71578031cba 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -718,7 +718,8 @@ If command is repeated at same position, delete the rectangle."
             (cdr (cdr cua--last-rectangle))
           (cua--rectangle-get-corners))
         cua--status-string (if (cua--rectangle-virtual-edges) " [R]" "")
-        cua--last-rectangle nil))
+        cua--last-rectangle nil)
+  (activate-mark))
 
 ;; (defvar cua-save-point nil)
 
@@ -731,7 +732,8 @@ If command is repeated at same position, delete the rectangle."
         cua--rectangle nil
         cua--rectangle-overlays nil
         cua--status-string nil
-        cua--mouse-last-pos nil))
+        cua--mouse-last-pos nil)
+  (deactivate-mark))
 
 (defun cua--highlight-rectangle ()
   ;; This function is used to highlight the rectangular region.
diff --git a/lisp/misearch.el b/lisp/misearch.el
index 0c4cd4ea323..36b826b862a 100644
--- a/lisp/misearch.el
+++ b/lisp/misearch.el
@@ -262,11 +262,11 @@ whose names match the specified regexp."
              (multi-isearch-read-matching-buffers)
            (multi-isearch-read-buffers))))
   (let ((multi-isearch-next-buffer-function
-         'multi-isearch-next-buffer-from-list)
-        (multi-isearch-buffer-list (mapcar #'get-buffer buffers)))
+         'multi-isearch-next-buffer-from-list))
+    (setq multi-isearch-buffer-list (mapcar #'get-buffer buffers))
     (switch-to-buffer (car multi-isearch-buffer-list))
     (goto-char (if isearch-forward (point-min) (point-max)))
-    (isearch-forward)))
+    (isearch-forward nil t)))
 
 ;;;###autoload
 (defun multi-isearch-buffers-regexp (buffers)
@@ -280,11 +280,11 @@ whose names match the specified regexp."
              (multi-isearch-read-matching-buffers)
            (multi-isearch-read-buffers))))
   (let ((multi-isearch-next-buffer-function
-         'multi-isearch-next-buffer-from-list)
-        (multi-isearch-buffer-list (mapcar #'get-buffer buffers)))
+         'multi-isearch-next-buffer-from-list))
+    (setq multi-isearch-buffer-list (mapcar #'get-buffer buffers))
     (switch-to-buffer (car multi-isearch-buffer-list))
     (goto-char (if isearch-forward (point-min) (point-max)))
-    (isearch-forward-regexp)))
+    (isearch-forward-regexp nil t)))
 
 
 ;;; Global multi-file search invocations
@@ -346,11 +346,11 @@ whose file names match the specified wildcard."
              (multi-isearch-read-matching-files)
            (multi-isearch-read-files))))
   (let ((multi-isearch-next-buffer-function
-         'multi-isearch-next-file-buffer-from-list)
-        (multi-isearch-file-list (mapcar #'expand-file-name files)))
+         'multi-isearch-next-file-buffer-from-list))
+    (setq multi-isearch-file-list (mapcar #'expand-file-name files))
     (find-file (car multi-isearch-file-list))
     (goto-char (if isearch-forward (point-min) (point-max)))
-    (isearch-forward)))
+    (isearch-forward nil t)))
 
 ;;;###autoload
 (defun multi-isearch-files-regexp (files)
@@ -365,11 +365,11 @@ whose file names match the specified wildcard."
              (multi-isearch-read-matching-files)
            (multi-isearch-read-files))))
   (let ((multi-isearch-next-buffer-function
-         'multi-isearch-next-file-buffer-from-list)
-        (multi-isearch-file-list (mapcar #'expand-file-name files)))
+         'multi-isearch-next-file-buffer-from-list))
+    (setq multi-isearch-file-list (mapcar #'expand-file-name files))
     (find-file (car multi-isearch-file-list))
     (goto-char (if isearch-forward (point-min) (point-max)))
-    (isearch-forward-regexp)))
+    (isearch-forward-regexp nil t)))
 
 
 (provide 'multi-isearch)
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 9d1c3a26949..8355ce1fb3c 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -418,7 +418,8 @@ word(s) will be searched for via `eww-search-prefix'."
 
     (easy-menu-define nil map ""
       '("Eww"
-        ["Quit" eww-quit t]
+        ["Exit" eww-quit t]
+        ["Close browser" quit-window t]
         ["Reload" eww-reload t]
         ["Back to previous page" eww-back-url
          :active (not (zerop (length eww-history)))]
@@ -429,7 +430,7 @@ word(s) will be searched for via `eww-search-prefix'."
         ["View page source" eww-view-source]
         ["Copy page URL" eww-copy-page-url t]
         ["Add bookmark" eww-add-bookmark t]
-        ["List bookmarks" eww-copy-page-url t]
+        ["List bookmarks" eww-list-bookmarks t]
         ["List cookies" url-cookie-list t]))
     map))
 
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 778659c0de4..d551d0ddb57 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -528,8 +528,14 @@ Non-nil means always go to the next Octave code line after sending."
 Octave is a high-level language, primarily intended for numerical
 computations.  It provides a convenient command line interface
 for solving linear and nonlinear problems numerically.  Function
-definitions can also be stored in files and used in batch mode."
+definitions can also be stored in files and used in batch mode.
+
+See Info node `(octave-mode) Using Octave Mode' for more details.
+
+Key bindings:
+\\{octave-mode-map}"
   :abbrev-table octave-abbrev-table
+  :group 'octave
 
   (smie-setup octave-smie-grammar #'octave-smie-rules
               :forward-token  #'octave-smie-forward-token
@@ -705,8 +711,16 @@ in the Inferior Octave buffer.")
   (process-live-p inferior-octave-process))
 
 (define-derived-mode inferior-octave-mode comint-mode "Inferior Octave"
-  "Major mode for interacting with an inferior Octave process."
+  "Major mode for interacting with an inferior Octave process.
+
+See Info node `(octave-mode) Running Octave from Within Emacs' for more
+details.
+
+Key bindings:
+\\{inferior-octave-mode-map}"
   :abbrev-table octave-abbrev-table
+  :group 'octave
+
   (setq comint-prompt-regexp inferior-octave-prompt)
 
   (setq-local comment-use-syntax t)
diff --git a/lisp/simple.el b/lisp/simple.el
index 260c1702def..af1139bb942 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7435,7 +7435,7 @@ See also `normal-erase-is-backspace'."
              (if enabled
                  (progn
                    (define-key local-function-key-map [delete] [deletechar])
-                   (define-key local-function-key-map [kp-delete] [?\C-d])
+                   (define-key local-function-key-map [kp-delete] [deletechar])
                    (define-key local-function-key-map [backspace] [?\C-?])
                    (dolist (b bindings)
                      ;; Not sure if input-decode-map is really right, but