Mercurial > emacs
changeset 90744:f1196eda45a0
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 30 Jan 2007 23:18:01 +0000 |
| parents | f83d17e1ace6 (current diff) 04f23eb0c0ca (diff) |
| children | 1b883722b73c |
| files | leim/CXTERM-DIC/4Corner.tit leim/CXTERM-DIC/CCDOSPY.tit leim/CXTERM-DIC/PY-b5.tit leim/CXTERM-DIC/QJ-b5.tit leim/CXTERM-DIC/QJ.tit leim/CXTERM-DIC/SW.tit leim/CXTERM-DIC/TONEPY.tit lisp/ChangeLog lisp/progmodes/gdb-ui.el |
| diffstat | 9 files changed, 47 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/leim/CXTERM-DIC/4Corner.tit Tue Jan 30 22:22:43 2007 +0000 +++ b/leim/CXTERM-DIC/4Corner.tit Tue Jan 30 23:18:01 2007 +0000 @@ -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
--- a/leim/CXTERM-DIC/CCDOSPY.tit Tue Jan 30 22:22:43 2007 +0000 +++ b/leim/CXTERM-DIC/CCDOSPY.tit Tue Jan 30 23:18:01 2007 +0000 @@ -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
--- a/leim/CXTERM-DIC/PY-b5.tit Tue Jan 30 22:22:43 2007 +0000 +++ b/leim/CXTERM-DIC/PY-b5.tit Tue Jan 30 23:18:01 2007 +0000 @@ -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
--- a/leim/CXTERM-DIC/QJ-b5.tit Tue Jan 30 22:22:43 2007 +0000 +++ b/leim/CXTERM-DIC/QJ-b5.tit Tue Jan 30 23:18:01 2007 +0000 @@ -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
--- a/leim/CXTERM-DIC/QJ.tit Tue Jan 30 22:22:43 2007 +0000 +++ b/leim/CXTERM-DIC/QJ.tit Tue Jan 30 23:18:01 2007 +0000 @@ -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
--- a/leim/CXTERM-DIC/SW.tit Tue Jan 30 22:22:43 2007 +0000 +++ b/leim/CXTERM-DIC/SW.tit Tue Jan 30 23:18:01 2007 +0000 @@ -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
--- a/leim/CXTERM-DIC/TONEPY.tit Tue Jan 30 22:22:43 2007 +0000 +++ b/leim/CXTERM-DIC/TONEPY.tit Tue Jan 30 23:18:01 2007 +0000 @@ -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
--- a/lisp/ChangeLog Tue Jan 30 22:22:43 2007 +0000 +++ b/lisp/ChangeLog Tue Jan 30 23:18:01 2007 +0000 @@ -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
--- a/lisp/progmodes/gdb-ui.el Tue Jan 30 22:22:43 2007 +0000 +++ b/lisp/progmodes/gdb-ui.el Tue Jan 30 23:18:01 2007 +0000 @@ -848,6 +848,19 @@ (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 @@ (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 @@ (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))