1 files changed, 39 insertions, 2 deletions

diff --git a/lisp/simple.el b/lisp/simple.el
index 7c941fd63b9..c1ec78da7b9 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1301,6 +1301,40 @@ to get different commands to edit and resubmit."
       (if command-history
           (error "Argument %d is beyond length of command history" arg)
         (error "There are no previous complex commands to repeat")))))
+
+(defun read-extended-command ()
+  "Read command name to invoke in `execute-extended-command'."
+  (minibuffer-with-setup-hook
+      (lambda ()
+        (set (make-local-variable 'minibuffer-default-add-function)
+             (lambda ()
+               ;; Get a command name at point in the original buffer
+               ;; to propose it after M-n.
+               (with-current-buffer (window-buffer (minibuffer-selected-window))
+                 (and (commandp (function-called-at-point))
+                      (format "%S" (function-called-at-point)))))))
+    ;; Read a string, completing from and restricting to the set of
+    ;; all defined commands.  Don't provide any initial input.
+    ;; Save the command read on the extended-command history list.
+    (completing-read
+     (concat (cond
+              ((eq current-prefix-arg '-) "- ")
+              ((and (consp current-prefix-arg)
+                    (eq (car current-prefix-arg) 4)) "C-u ")
+              ((and (consp current-prefix-arg)
+                    (integerp (car current-prefix-arg)))
+               (format "%d " (car current-prefix-arg)))
+              ((integerp current-prefix-arg)
+               (format "%d " current-prefix-arg)))
+             ;; This isn't strictly correct if `execute-extended-command'
+             ;; is bound to anything else (e.g. [menu]).
+             ;; It could use (key-description (this-single-command-keys)),
+             ;; but actually a prompt other than "M-x" would be confusing,
+             ;; because "M-x" is a well-known prompt to read a command
+             ;; and it serves as a shorthand for "Extended command: ".
+             "M-x ")
+     obarray 'commandp t nil 'extended-command-history)))
+
 
 (defvar minibuffer-history nil
   "Default minibuffer history list.
@@ -3103,7 +3137,8 @@ If the buffer is read-only, Emacs will beep and refrain from deleting
 the text, but put the text in the kill ring anyway.  This means that
 you can use the killing commands to copy text from a read-only buffer.
 
-This is the primitive for programs to kill text (as opposed to deleting it).
+Lisp programs should use this function for killing text.
+ (To delete text, use `delete-region'.)
 Supply two arguments, character positions indicating the stretch of text
  to be killed.
 Any command that calls this function is a \"kill command\".
@@ -5495,7 +5530,9 @@ it skips the contents of comments that end before point."
                        (and parse-sexp-ignore-comments
                             (not blink-matching-paren-dont-ignore-comments))))
                   (condition-case ()
-                      (scan-sexps oldpos -1)
+                      (progn
+                        (forward-sexp -1)
+                        (point))
                     (error nil))))))
            (matching-paren
             (and blinkpos