[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/tutorial.el,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/tutorial.el,v |
Date: |
Tue, 09 Jan 2007 13:09:44 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 07/01/09 13:09:44
Index: tutorial.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/tutorial.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tutorial.el 3 Jan 2007 12:02:24 -0000 1.10
+++ tutorial.el 9 Jan 2007 13:09:44 -0000 1.11
@@ -446,7 +446,8 @@
(cond ((eq key-fun def-fun)
;; No rebinding, return t
t)
- ((eq key-fun (command-remapping def-fun))
+ ((and key-fun
+ (eq key-fun (command-remapping def-fun)))
;; Just a remapping, return t
t)
;; cua-mode specials:
@@ -571,6 +572,8 @@
(where (nth 3 ck))
s1 s2 help-string)
(unless (string= where "Same key")
+ (when (string= where "")
+ (setq where (format "M-x %s" def-fun)))
(setq tutorial--point-after-chkeys (point-marker)
s1 (get-lang-string tutorial--lang 'tut-chgdkey)
s2 (get-lang-string tutorial--lang 'tut-chgdkey2)
- [Emacs-diffs] Changes to emacs/lisp/tutorial.el,v, Juanma Barranquero, 2007/01/03
- [Emacs-diffs] Changes to emacs/lisp/tutorial.el,v,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/lisp/tutorial.el,v, Glenn Morris, 2007/01/20
- [Emacs-diffs] Changes to emacs/lisp/tutorial.el,v, Richard M. Stallman, 2007/01/28
- [Emacs-diffs] Changes to emacs/lisp/tutorial.el,v, Richard M. Stallman, 2007/01/30