[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/tmm.el,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/tmm.el,v |
Date: |
Wed, 29 Oct 2008 20:57:04 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 08/10/29 20:57:03
Index: tmm.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/tmm.el,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- tmm.el 6 May 2008 07:57:55 -0000 1.60
+++ tmm.el 29 Oct 2008 20:57:03 -0000 1.61
@@ -462,11 +462,11 @@
(or (keymapp (cdr-safe (cdr-safe elt)))
(eq (car (cdr-safe (cdr-safe elt))) 'lambda))
(fboundp (cdr-safe (cdr-safe elt))))
- (setq km (cdr (cdr elt)))
+ (setq km (cddr elt))
(and (stringp (car elt)) (setq str (car elt)))
(and str
- (stringp (cdr (car (cdr elt)))) ; keyseq cache
- (setq cache (cdr (car (cdr elt))))
+ (stringp (cdr-safe (cadr elt))) ; keyseq cache
+ (setq cache (cdr (cadr elt)))
cache (setq str (concat str cache))))
((eq (car-safe elt) 'menu-item)
@@ -497,18 +497,17 @@
(eq (car (cdr-safe (cdr-safe (cdr-safe elt)))) 'lambda))
(fboundp (cdr-safe (cdr-safe (cdr-safe elt)))))
; New style of easy-menu
- (setq km (cdr (cdr (cdr elt))))
+ (setq km (cdr (cddr elt)))
(and (stringp (car elt)) (setq str (car elt)))
(and str
- (stringp (cdr (car (cdr (cdr elt))))) ; keyseq cache
+ (stringp (cdr-safe (car (cddr elt)))) ; keyseq cache
(setq cache (cdr (car (cdr (cdr elt)))))
cache (setq str (concat str cache))))
((stringp event) ; x-popup or x-popup element
(if (or in-x-menu (stringp (car-safe elt)))
(setq str event event nil km elt)
- (setq str event event nil km (cons 'keymap elt))
- ))))
+ (setq str event event nil km (cons 'keymap elt))))))
(and km (stringp km) (setq str km))
;; Verify that the command is enabled;
;; if not, don't mention it.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/tmm.el,v,
Chong Yidong <=