Merged from miles@gnu.org--gnu-2005 (patch 160-161)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-160
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-161
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-308

8 files changed, 103 insertions, 42 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a3826bf9a4b..df930a970d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,31 @@
+2005-03-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/debug.el (debug-on-entry-1): Fix handling of macros.
+
+2005-03-07  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (move-beginning-of-line): New command.
+
+        * bindings.el (global-map): Bind C-a to move-beginning-of-line.
+
+        * reveal.el (reveal-mode-map): Bind C-a to beginning-of-line.
+
+        * emulation/cua-base.el: Put CUA move property on move-end-of-line
+        and move-beginning-of-line.
+
+        * apropos.el (apropos-print): Omit command from M-x ... RET.
+
+2005-03-07  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-var-create-handler): Handle just MI case.
+        (gdb-send, gdb-send-item): Log items sent from gdb-send too.
+
+2005-03-06  Richard M. Stallman  <rms@gnu.org>
+
+        * bindings.el (esc-map): Bind M-g to goto-line.
+
+        * facemenu.el (global-map): Bind M-o, not M-g.
+
 2005-03-06  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * menu-bar.el (menu-bar-file-menu): Add the same :enable to
@@ -26,7 +54,7 @@
 
 2005-03-03  Stephan Stahl  <stahl@eos.franken.de> (tiny change)
 
-        * progmodes/which-func.el (which-function): 
+        * progmodes/which-func.el (which-function):
         Specify NOERROR when calling imenu--make-index-alist.
 
 2005-03-05  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -76,14 +104,12 @@
 
         * calendar/icalendar.el (icalendar-version): Increase to 0.11.
         (icalendar-export-file, icalendar-export-region)
-        (icalendar-import-file, icalendar-import-buffer): Add autoload
-        cookies.
+        (icalendar-import-file, icalendar-import-buffer): Add autoload cookies.
         (icalendar--convert-ical-to-diary): Fix problem with DURATION.
 
 2005-03-04  Lute Kamstra  <lute@gnu.org>
 
-        * emacs-lisp/debug.el (debugger-step-after-exit): Make it a
-        defvar.
+        * emacs-lisp/debug.el (debugger-step-after-exit): Make it a defvar.
         (debug-function-list): Ditto.
 
 2005-03-04  Robert J. Chassell  <bob@rattlesnake.com>
@@ -93,7 +119,7 @@
         is not appended by replacing a search for `@refill\\|@bye' with
         `@refill\\|^[ \t]*@'.  The intent is to solve both the `@end
         itemize@refill' bug and the unfilled long lines bug.
-        (texinfmt-version): update number and date.
+        (texinfmt-version): Update number and date.
 
 2005-03-04  Reiner Steib  <Reiner.Steib@gmx.de>
 
diff --git a/lisp/apropos.el b/lisp/apropos.el
index ae8a4ad628c..b9d7e3ff41d 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -860,13 +860,12 @@ If non-nil TEXT is a string that will be printed as a heading."
                                               key))
                        key)
                      item ", "))
-                 (insert "M-x")
-                 (put-text-property (- (point) 3) (point)
-                                    'face apropos-keybinding-face)
-                 (insert " " (symbol-name symbol) " ")
-                 (insert "RET")
-                 (put-text-property (- (point) 3) (point)
-                                    'face apropos-keybinding-face)))
+                 (insert "M-x ... RET")
+                 (when apropos-keybinding-face
+                   (put-text-property (- (point) 11) (- (point) 8)
+                                      'face apropos-keybinding-face)
+                   (put-text-property (- (point) 3) (point)
+                                      'face apropos-keybinding-face))))
           (terpri)
           (apropos-print-doc 2
                              (if (commandp symbol)
diff --git a/lisp/bindings.el b/lisp/bindings.el
index a581027993c..98b10f20ce2 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -700,6 +700,7 @@ language you are using."
 (define-key global-map "\C-n" 'next-line)
 (define-key global-map "\C-p" 'previous-line)
 (define-key ctl-x-map "\C-n" 'set-goal-column)
+(define-key global-map "\C-a" 'move-beginning-of-line)
 (define-key global-map "\C-e" 'move-end-of-line)
 (define-key esc-map "g" 'goto-line)
 
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index ab197e8e119..67836215da3 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -693,25 +693,24 @@ If argument is nil or an empty string, cancel for all functions."
           (fset function (cons 'lambda (cons (car contents) body)))))))
 
 (defun debug-on-entry-1 (function defn flag)
-  (if (subrp defn)
-      (error "%s is a built-in function" function)
-    (if (eq (car defn) 'macro)
-        (debug-on-entry-1 function (cdr defn) flag)
-      (or (eq (car defn) 'lambda)
-          (error "%s not user-defined Lisp function" function))
-      (let ((tail (cdr defn)))
-        ;; Skip the docstring.
-        (when (and (stringp (cadr tail)) (cddr tail))
-          (setq tail (cdr tail)))
-        ;; Skip the interactive form.
-        (when (eq 'interactive (car-safe (cadr tail)))
-          (setq tail (cdr tail)))
-        (unless (eq flag (equal (cadr tail) debug-entry-code))
-          ;; Add/remove debug statement as needed.
-          (if flag
-              (setcdr tail (cons debug-entry-code (cdr tail)))
-            (setcdr tail (cddr tail))))
-        defn))))
+  (let ((tail defn))
+    (if (subrp tail)
+        (error "%s is a built-in function" function)
+      (if (eq (car tail) 'macro) (setq tail (cdr tail)))
+      (if (eq (car tail) 'lambda) (setq tail (cdr tail))
+        (error "%s not user-defined Lisp function" function))
+      ;; Skip the docstring.
+      (when (and (stringp (cadr tail)) (cddr tail))
+        (setq tail (cdr tail)))
+      ;; Skip the interactive form.
+      (when (eq 'interactive (car-safe (cadr tail)))
+        (setq tail (cdr tail)))
+      (unless (eq flag (equal (cadr tail) debug-entry-code))
+        ;; Add/remove debug statement as needed.
+        (if flag
+            (setcdr tail (cons debug-entry-code (cdr tail)))
+          (setcdr tail (cddr tail))))
+      defn)))
 
 (defun debugger-list-functions ()
   "Display a list of all the functions now set to debug on entry."
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 76c0f860a00..d72dc91ad2b 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1284,6 +1284,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
    next-line previous-line
    forward-word backward-word
    end-of-line beginning-of-line
+   move-end-of-line move-beginning-of-line
    end-of-buffer beginning-of-buffer
    scroll-up scroll-down
    forward-sentence backward-sentence
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 00da2e70dd7..4fc259cae51 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -341,8 +341,12 @@ detailed description of this mode.
           (speedbar 1)
           (if (equal (nth 2 var) "0")
               (gdb-enqueue-input
-               (list (concat "server interpreter mi \"-var-evaluate-expression "
-                             (nth 1 var) "\"\n")
+               (list
+                (if (with-current-buffer
+                        gud-comint-buffer (eq gud-minor-mode 'gdba))
+                    (concat "server interpreter mi \"-var-evaluate-expression "
+                            (nth 1 var) "\"\n")
+                  (concat "-var-evaluate-expression " (nth 1 var) "\n"))
                      `(lambda () (gdb-var-evaluate-expression-handler
                                   ,(nth 1 var) nil))))
             (setq gdb-var-changed t)))
@@ -368,8 +372,8 @@ detailed description of this mode.
 
 (defun gdb-var-list-children (varnum)
   (gdb-enqueue-input
-   (list (concat "server interpreter mi \"-var-list-children "  varnum "\"\n")
-             `(lambda () (gdb-var-list-children-handler ,varnum)))))
+   (list (concat "server interpreter mi \"-var-list-children " varnum "\"\n")
+         `(lambda () (gdb-var-list-children-handler ,varnum)))))
 
 (defconst gdb-var-list-children-regexp
   "name=\"\\(.*?\\)\",exp=\"\\(.*?\\)\",numchild=\"\\(.*?\\)\"")
@@ -674,9 +678,12 @@ The key should be one of the cars in `gdb-buffer-rules-assoc'."
 (defun gdb-send (proc string)
   "A comint send filter for gdb.
 This filter may simply queue input for a later time."
-  (if gud-running
-      (process-send-string proc (concat string "\n"))
-    (gdb-enqueue-input (concat string "\n"))))
+  (let ((item (concat string "\n")))
+    (if gud-running
+      (progn
+        (if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log))
+        (process-send-string proc item))
+      (gdb-enqueue-input item))))
 
 ;; Note: Stuff enqueued here will be sent to the next prompt, even if it
 ;; is a query, or other non-top-level prompt.
@@ -697,7 +704,7 @@ This filter may simply queue input for a later time."
 
 (defun gdb-send-item (item)
   (setq gdb-flush-pending-output nil)
-  (if gdb-enable-debug-log (push (cons 'send item) gdb-debug-log))
+  (if gdb-enable-debug-log (push (cons 'send-item item) gdb-debug-log))
   (setq gdb-current-item item)
   (with-current-buffer gud-comint-buffer
     (if (eq gud-minor-mode 'gdba)
diff --git a/lisp/reveal.el b/lisp/reveal.el
index 4d2742a4810..eb6b4519f38 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -161,8 +161,9 @@
 
 (defvar reveal-mode-map
   (let ((map (make-sparse-keymap)))
-    ;; Override the default move-end-of-line which skips valuable
-    ;; invisible text.
+    ;; Override the default move-beginning-of-line and move-end-of-line
+    ;; which skips valuable invisible text.
+    (define-key map [?\C-a] 'beginning-of-line)
     (define-key map [?\C-e] 'end-of-line)
     map))
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 50a727aa15f..d0d5f9f0170 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3521,6 +3521,33 @@ boundaries bind `inhibit-field-text-motion' to t."
               (setq arg 1)
             (setq done t)))))))
 
+(defun move-beginning-of-line (arg)
+  "Move point to beginning of current display line.
+With argument ARG not nil or 1, move forward ARG - 1 lines first.
+If point reaches the beginning or end of buffer, it stops there.
+To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
+
+This command does not move point across a field boundary unless doing so
+would move beyond there to a different line; if ARG is nil or 1, and
+point starts at a field boundary, point does not move.  To ignore field
+boundaries bind `inhibit-field-text-motion' to t."
+  (interactive "p")
+  (or arg (setq arg 1))
+  (if (/= arg 1)
+      (line-move (1- arg) t))
+  (let (done pos)
+    (while (not done)
+      (beginning-of-line 1)
+      ;; (not bolp) means that it stopped at a field boundary.
+      (if (or (bobp) (not (bolp)))
+          (setq done t)
+        (sit-for 0)
+        (if (and (consp (setq pos (pos-visible-in-window-p (point) nil t)))
+                 (= (car pos) 0))
+            (setq done t)
+          (backward-char 1))))))
+
+
 ;;; Many people have said they rarely use this feature, and often type
 ;;; it by accident.  Maybe it shouldn't even be on a key.
 (put 'set-goal-column 'disabled t)