emacs: lisp/tutorial.el comparison

comparison lisp/tutorial.el @ 75471:afea84ac9ef8

(tutorial--default-keys): Check M-DEL, not `M-backspace'. Don't check `backspace'. (tutorial--find-changed-keys): Look up bindings in a temp buffer in Fundamental mode.

author	Richard M. Stallman <rms@gnu.org>
date	Sun, 28 Jan 2007 07:08:51 +0000
parents	e3694f1cb928
children	21cbf755a07c

comparison

equal deleted inserted replaced

-:b391b0c782f4
+:afea84ac9ef8
 ;; C-u 0 C-l
 ;; Type CONTROL-h k CONTROL-f.
 ;; * INSERTING AND DELETING
 ;; C-u 8 * to insert ********.
-(delete-backward-char [backspace])
 (delete-backward-char "\d")
 (delete-char [?\C-d])
-(backward-kill-word [(meta backspace)])
+(backward-kill-word [?\M-\d])
 (kill-word [?\M-d])
 (kill-line [?\C-k])
 (kill-sentence [?\M-k])
 (set-mark-command [?\C-@])
 (set-mark-command [?\C- ])
 KEY-FUN is the actual binding for KEY.
 QUIET       is t if this changed keybinding should be handled quietly.
 This is used by `tutorial--display-changes'."
 (let (changed-keys remark)
-(dolist (kdf default-keys)
+;; Look up the bindings in a Fundamental mode buffer
-;; The variables below corresponds to those with the same names
+;; so we do not get fooled by some other major mode.
-;; described in the doc string.
+(with-temp-buffer
-(let* ((key     (nth 1 kdf))
+(fundamental-mode)
-(def-fun (nth 0 kdf))
+(dolist (kdf default-keys)
-(def-fun-txt (format "%s" def-fun))
+	;; The variables below corresponds to those with the same names
-(rem-fun (command-remapping def-fun))
+	;; described in the doc string.
-(key-fun (if (eq def-fun 'ESC-prefix)
+	(let* ((key     (nth 1 kdf))
-			  (lookup-key global-map [27])
+	       (def-fun (nth 0 kdf))
-			(key-binding key)))
+	       (def-fun-txt (format "%s" def-fun))
-(where (where-is-internal (if rem-fun rem-fun def-fun))))
+	       (rem-fun (command-remapping def-fun))
-(if where
+	       (key-fun (if (eq def-fun 'ESC-prefix)
-(progn
+			    (lookup-key global-map [27])
-(setq where (key-description (car where)))
+			  (key-binding key)))
-(when (and (< 10 (length where))
+	       (where (where-is-internal (if rem-fun rem-fun def-fun))))
-(string= (substring where 0 (length "<menu-bar>"))
+	  (if where
-"<menu-bar>"))
+	      (progn
-(setq where "the menus")))
+		(setq where (key-description (car where)))
-(setq where ""))
+		(when (and (< 10 (length where))
-(setq remark nil)
+			   (string= (substring where 0 (length "<menu-bar>"))
-(unless
+				    "<menu-bar>"))
-(cond ((eq key-fun def-fun)
+		  (setq where "the menus")))
-;; No rebinding, return t
+	    (setq where ""))
-t)
+	  (setq remark nil)
-((and key-fun
+	  (unless
-			(eq key-fun (command-remapping def-fun)))
+	      (cond ((eq key-fun def-fun)
-;; Just a remapping, return t
+		     ;; No rebinding, return t
-t)
+		     t)
-;; cua-mode specials:
+		    ((and key-fun
-((and cua-mode
+			  (eq key-fun (command-remapping def-fun)))
-(or (and
+		     ;; Just a remapping, return t
-(equal key [?\C-v])
+		     t)
-(eq key-fun 'cua-paste))
+		    ;; cua-mode specials:
-(and
+		    ((and cua-mode
-(equal key [?\C-z])
+			  (or (and
-(eq key-fun 'undo))))
+			       (equal key [?\C-v])
-(setq remark (list "cua-mode, more info" 'cua-mode))
+			       (eq key-fun 'cua-paste))
-nil)
+			      (and
-((and cua-mode
+			       (equal key [?\C-z])
-(or (and (eq def-fun 'ESC-prefix)
+			       (eq key-fun 'undo))))
-				 (equal key-fun
+		     (setq remark (list "cua-mode, more info" 'cua-mode))
-`(keymap
+		     nil)
-(118 . cua-repeat-replace-region)))
+		    ((and cua-mode
-				 (setq def-fun-txt "\"ESC prefix\""))
+			  (or (and (eq def-fun 'ESC-prefix)
-			    (and (eq def-fun 'mode-specific-command-prefix)
+				   (equal key-fun
-				 (equal key-fun
+					  `(keymap
-					'(keymap
+					    (118 . cua-repeat-replace-region)))
-					  (timeout . copy-region-as-kill)))
+				   (setq def-fun-txt "\"ESC prefix\""))
-				 (setq def-fun-txt "\"C-c prefix\""))
+			      (and (eq def-fun 'mode-specific-command-prefix)
-			    (and (eq def-fun 'Control-X-prefix)
+				   (equal key-fun
-				 (equal key-fun
+					  '(keymap
-					'(keymap (timeout . kill-region)))
+					    (timeout . copy-region-as-kill)))
-				 (setq def-fun-txt "\"C-x prefix\""))))
+				   (setq def-fun-txt "\"C-c prefix\""))
-(setq remark (list "cua-mode replacement" 'cua-mode))
+			      (and (eq def-fun 'Control-X-prefix)
-(setq where "Same key")
+				   (equal key-fun
-nil)
+					  '(keymap (timeout . kill-region)))
-;; viper-mode specials:
+				   (setq def-fun-txt "\"C-x prefix\""))))
-((and (boundp 'viper-mode-string)
+		     (setq remark (list "cua-mode replacement" 'cua-mode))
-			(boundp 'viper-current-state)
+		     (setq where "Same key")
-(eq viper-current-state 'vi-state)
+		     nil)
-(or (and (eq def-fun 'isearch-forward)
+		    ;; viper-mode specials:
-(eq key-fun 'viper-isearch-forward))
+		    ((and (boundp 'viper-mode-string)
-(and (eq def-fun 'isearch-backward)
+			  (boundp 'viper-current-state)
-(eq key-fun 'viper-isearch-backward))))
+			  (eq viper-current-state 'vi-state)
-;; These bindings works as the default bindings,
+			  (or (and (eq def-fun 'isearch-forward)
-;; return t
+				   (eq key-fun 'viper-isearch-forward))
-t)
+			      (and (eq def-fun 'isearch-backward)
-((when normal-erase-is-backspace
+				   (eq key-fun 'viper-isearch-backward))))
-(or (and (equal key [C-delete])
+		     ;; These bindings works as the default bindings,
-(equal key-fun 'kill-word))
+		     ;; return t
-(and (equal key [C-backspace])
+		     t)
-(equal key-fun 'backward-kill-word))))
+		    ((when normal-erase-is-backspace
-;; This is the strange handling of C-delete and
+		       (or (and (equal key [C-delete])
-;; C-backspace, return t
+				(equal key-fun 'kill-word))
-t)
+			   (and (equal key [C-backspace])
-(t
+				(equal key-fun 'backward-kill-word))))
-;; This key has indeed been rebound. Put information
+		     ;; This is the strange handling of C-delete and
-;; in `remark' and return nil
+		     ;; C-backspace, return t
-(setq remark
+		     t)
-(list "more info" 'current-binding
+		    (t
-key-fun def-fun key where))
+		     ;; This key has indeed been rebound. Put information
-nil))
+		     ;; in `remark' and return nil
-(add-to-list 'changed-keys
+		     (setq remark
-(list key def-fun def-fun-txt where remark nil)))))
+			   (list "more info" 'current-binding
+				 key-fun def-fun key where))
+		     nil))
+	    (add-to-list 'changed-keys
+			 (list key def-fun def-fun-txt where remark nil))))))
 changed-keys))
 (defun tutorial--key-description (key)
 (let ((desc (key-description key)))
 (cond ((string= "ESC" desc) "<ESC>")
 (when (or (not ext)
 (string= ext ""))
 (setq file-name (concat file-name ".tut")))
 (expand-file-name file-name (tutorial--saved-dir))))
-(defun tutorial--remove-remarks()
+(defun tutorial--remove-remarks ()
 "Remove the remark lines that was added to the tutorial buffer."
 (save-excursion
 (goto-char (point-min))
 (let (prop-start
 prop-end
 the list are themselves association lists with keys that are
 string ids and values that are the language specific strings.
 See `get-lang-string' for more information.")
-(defun get-lang-string(lang stringid &optional no-eng-fallback)
+(defun get-lang-string (lang stringid &optional no-eng-fallback)
 "Get a language specific string for Emacs.
 In certain places Emacs can replace a string showed to the user with a language specific string.
 This function retrieves such strings.
 LANG is the language specification. It should be one of those

Mercurial > emacs

comparison lisp/tutorial.el @ 75471:afea84ac9ef8