summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1993-06-03 19:35:54 +0000
committerRichard M. Stallman <rms@gnu.org>1993-06-03 19:35:54 +0000
commit81b271128621397d2899d994e73360ceac8016a9 (patch)
treeb2ef0e10e20beaae47c147f4acdc21f212c97ac2 /lisp/progmodes
parent6bf9133d7f9047d0494ce0c9407042d1d5702f66 (diff)
downloademacs-81b271128621397d2899d994e73360ceac8016a9.tar.gz
(define-hide-ifdef-mode-map): Don't bind C-c LETTER.
Use C-c ESC LETTER instead. Handle case where where-is-internal returns nil.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/hideif.el20
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 4d8ecefe7bf..b408431e45f 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -154,13 +154,13 @@ before `hide-ifdef-mode' modifies it.")
(if hide-ifdef-mode-map
() ; dont redefine it.
(setq hide-ifdef-mode-map (make-sparse-keymap))
- (define-key hide-ifdef-mode-map "d" 'hide-ifdef-define)
- (define-key hide-ifdef-mode-map "u" 'hide-ifdef-undef)
- (define-key hide-ifdef-mode-map "D" 'hide-ifdef-set-define-alist)
- (define-key hide-ifdef-mode-map "U" 'hide-ifdef-use-define-alist)
+ (define-key hide-ifdef-mode-map "\ed" 'hide-ifdef-define)
+ (define-key hide-ifdef-mode-map "\eu" 'hide-ifdef-undef)
+ (define-key hide-ifdef-mode-map "\eD" 'hide-ifdef-set-define-alist)
+ (define-key hide-ifdef-mode-map "\eU" 'hide-ifdef-use-define-alist)
- (define-key hide-ifdef-mode-map "h" 'hide-ifdefs)
- (define-key hide-ifdef-mode-map "s" 'show-ifdefs)
+ (define-key hide-ifdef-mode-map "\eh" 'hide-ifdefs)
+ (define-key hide-ifdef-mode-map "\es" 'show-ifdefs)
(define-key hide-ifdef-mode-map "\C-h" 'hide-ifdef-block)
(define-key hide-ifdef-mode-map "\C-s" 'show-ifdef-block)
@@ -171,9 +171,11 @@ before `hide-ifdef-mode' modifies it.")
(define-key hide-ifdef-mode-map "\C-n" 'next-ifdef)
(define-key hide-ifdef-mode-map "\C-p" 'previous-ifdef)
(define-key hide-ifdef-mode-map "\C-q" 'hide-ifdef-toggle-read-only)
- (define-key hide-ifdef-mode-map
- (where-is-internal 'toggle-read-only nil nil t)
- 'hide-ifdef-toggle-outside-read-only)
+ (let ((where (where-is-internal 'toggle-read-only nil nil t)))
+ (if where
+ (define-key hide-ifdef-mode-map
+ where
+ 'hide-ifdef-toggle-outside-read-only)))
)
(fset 'hide-ifdef-mode-map hide-ifdef-mode-map) ; the function is the map
)