Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 622-623)

   - Update from CVS
   - Remove RCS keywords

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-167

9 files changed, 47 insertions, 25 deletions

diff --git a/leim/CXTERM-DIC/4Corner.tit b/leim/CXTERM-DIC/4Corner.tit
index c73d9e389e9..b62a4ff922d 100644
--- a/leim/CXTERM-DIC/4Corner.tit
+++ b/leim/CXTERM-DIC/4Corner.tit
@@ -1,4 +1,3 @@
-# $Id: 4Corner.tit,v 1.5 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/CXTERM-DIC/CCDOSPY.tit b/leim/CXTERM-DIC/CCDOSPY.tit
index 1c94c44b1ac..c428f126a24 100644
--- a/leim/CXTERM-DIC/CCDOSPY.tit
+++ b/leim/CXTERM-DIC/CCDOSPY.tit
@@ -18,6 +18,7 @@
 # purpose.  It is provided "as is" without express or implied warranty.
 #
 # End of header added for Emacs
+#
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/CXTERM-DIC/PY-b5.tit b/leim/CXTERM-DIC/PY-b5.tit
index ae330dbc906..e34fd3a87dc 100644
--- a/leim/CXTERM-DIC/PY-b5.tit
+++ b/leim/CXTERM-DIC/PY-b5.tit
@@ -1,4 +1,24 @@
-# $Id: PY-b5.tit,v 1.3 2007/01/24 06:35:08 handa Exp $
+# Header added for Emacs
+#
+# This file is included in the directory contrib/clients/cxterm of the
+# distribution of X11R6.  As the file itself does't contain copyright
+# and license notices, the following statements in the section 6 of
+# the file .../cxterm/README covers it.
+#
+# X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
+# X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
+# 
+# Permission to use, copy, modify, and distribute this software and
+# its documentation for any purpose is hereby granted without fee,
+# provided that this entire copyright and permission notice appear
+# in all such copies, and that the name of the authors may not be
+# used to endorse or promote products derived from this material
+# without specific prior written permission.  The authors make no
+# representations about the suitability of this software for any
+# purpose.  It is provided "as is" without express or implied warranty.
+#
+# End of header added for Emacs
+#
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/CXTERM-DIC/QJ-b5.tit b/leim/CXTERM-DIC/QJ-b5.tit
index 9b18b52486c..4214616b056 100644
--- a/leim/CXTERM-DIC/QJ-b5.tit
+++ b/leim/CXTERM-DIC/QJ-b5.tit
@@ -1,4 +1,3 @@
-# $Id: QJ-b5.tit,v 1.3 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/CXTERM-DIC/QJ.tit b/leim/CXTERM-DIC/QJ.tit
index 06c67708072..d620a30fba4 100644
--- a/leim/CXTERM-DIC/QJ.tit
+++ b/leim/CXTERM-DIC/QJ.tit
@@ -1,4 +1,3 @@
-# $Id: QJ.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/CXTERM-DIC/SW.tit b/leim/CXTERM-DIC/SW.tit
index f9d640e23da..f87ae53e348 100644
--- a/leim/CXTERM-DIC/SW.tit
+++ b/leim/CXTERM-DIC/SW.tit
@@ -18,6 +18,7 @@
 # purpose.  It is provided "as is" without express or implied warranty.
 #
 # End of header added for Emacs
+#
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit
index 8ada4971d83..586987fd3c1 100644
--- a/leim/CXTERM-DIC/TONEPY.tit
+++ b/leim/CXTERM-DIC/TONEPY.tit
@@ -18,6 +18,7 @@
 # purpose.  It is provided "as is" without express or implied warranty.
 #
 # End of header added for Emacs
+#
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 222ce4626b4..0aff935a412 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-30  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-var-delete-1): New function.
+        (gdb-var-delete): Use it.
+        (gdb-var-update-handler-1): Handle value "invalid" for MI field
+        `in_scope'.
+
 2007-01-30  Michael Albinus  <michael.albinus@gmx.de>
 
         * files.el (get-free-disk-space): Return nil for remote
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index c2811a9658a..c4cd96010a6 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -848,6 +848,19 @@ type_changed=\".*?\".*?}")
   (setq gdb-pending-triggers
         (delq 'gdb-var-update gdb-pending-triggers)))
 
+(defun gdb-var-delete-1 (varnum)
+  (gdb-enqueue-input
+   (list
+    (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
+            'gdba)
+        (concat "server interpreter mi \"-var-delete " varnum "\"\n")
+      (concat "-var-delete " varnum "\n"))
+    'ignore))
+  (setq gdb-var-list (delq var gdb-var-list))
+  (dolist (varchild gdb-var-list)
+    (if (string-match (concat (car var) "\\.") (car varchild))
+        (setq gdb-var-list (delq varchild gdb-var-list)))))
+
 (defun gdb-var-delete ()
   "Delete watch expression at point from the speedbar."
   (interactive)
@@ -857,17 +870,7 @@ type_changed=\".*?\".*?}")
              (varnum (car var)))
         (if (string-match "\\." (car var))
             (message-box "Can only delete a root expression")
-          (gdb-enqueue-input
-           (list
-            (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
-                    'gdba)
-                (concat "server interpreter mi \"-var-delete " varnum "\"\n")
-              (concat "-var-delete " varnum "\n"))
-            'ignore))
-          (setq gdb-var-list (delq var gdb-var-list))
-          (dolist (varchild gdb-var-list)
-            (if (string-match (concat (car var) "\\.") (car varchild))
-                (setq gdb-var-list (delq varchild gdb-var-list))))))))
+          (gdb-var-delete-1 varnum)))))
 
 (defun gdb-var-delete-children (varnum)
   "Delete children of variable object at point from the speedbar."
@@ -3443,16 +3446,8 @@ in_scope=\"\\(.*?\\)\".*?}")
                  (setcar (nthcdr 5 var) 'changed)
                  (setcar (nthcdr 4 var)
                          (read (match-string 2))))
-;;              ((string-equal match "invalid")
-;;               (gdb-enqueue-input
-;;                (list
-;;                 (if (eq (buffer-local-value
-;;                          'gud-minor-mode gud-comint-buffer) 'gdba)
-;;                     (concat "server interpreter mi \"-var-delete "
-;;                             varnum "\"\n")
-;;                   (concat "-var-delete " varnum "\n"))
-;;                 'ignore)))
-                )))))
+                ((string-equal match "invalid")
+                 (gdb-var-delete-1 varnum)))))))
       (setq gdb-pending-triggers
             (delq 'gdb-var-update gdb-pending-triggers))
       (gdb-speedbar-update))