diff options
| author | Dan Nicolaescu | 2008-02-17 18:55:24 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-02-17 18:55:24 +0000 |
| commit | d79dd1b083dbdd633b143355fedf4d89ca237763 (patch) | |
| tree | 1f614fe97a0ee1e2d0cb489c571e4a0c0a093800 | |
| parent | a2b84f35b3d89533a5429da46f7aa124efb1d18e (diff) | |
| download | emacs-d79dd1b083dbdd633b143355fedf4d89ca237763.tar.gz emacs-d79dd1b083dbdd633b143355fedf4d89ca237763.zip | |
(hs-minor-mode-map): Move menu creation to
top level.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/hideshow.el | 31 |
2 files changed, 19 insertions, 15 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 805570ea41a..912fa3edf67 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2008-02-17 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2008-02-17 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * progmodes/hideshow.el (hs-minor-mode-map): Move menu creation to | ||
| 4 | top level. | ||
| 5 | |||
| 3 | * simple.el (transient-mark-mode): Add an :init-value. | 6 | * simple.el (transient-mark-mode): Add an :init-value. |
| 4 | 7 | ||
| 5 | * startup.el (command-line): Use custom-reevaluate-setting for | 8 | * startup.el (command-line): Use custom-reevaluate-setting for |
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index f0065cbedaf..dcda521f146 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el | |||
| @@ -355,24 +355,25 @@ Use the command `hs-minor-mode' to toggle or set this variable.") | |||
| 355 | (define-key map "\C-c@\C-l" 'hs-hide-level) | 355 | (define-key map "\C-c@\C-l" 'hs-hide-level) |
| 356 | (define-key map "\C-c@\C-c" 'hs-toggle-hiding) | 356 | (define-key map "\C-c@\C-c" 'hs-toggle-hiding) |
| 357 | (define-key map [(shift mouse-2)] 'hs-mouse-toggle-hiding) | 357 | (define-key map [(shift mouse-2)] 'hs-mouse-toggle-hiding) |
| 358 | (easy-menu-define hs-minor-mode-menu map | ||
| 359 | "Menu used when hideshow minor mode is active." | ||
| 360 | '("Hide/Show" | ||
| 361 | ["Hide Block" hs-hide-block | ||
| 362 | :help "Hide the code or comment block at point"] | ||
| 363 | ["Show Block" hs-show-block | ||
| 364 | :help "Show the code or comment block at point"] | ||
| 365 | ["Hide All" hs-hide-all | ||
| 366 | :help "Hide all the blocks in the buffer"] | ||
| 367 | ["Show All" hs-show-all | ||
| 368 | :help "Show all the clocks in the buffer"] | ||
| 369 | ["Hide Level" hs-hide-level | ||
| 370 | :help "Hide all block at levels below the current block"] | ||
| 371 | ["Toggle Hiding" hs-toggle-hiding | ||
| 372 | :help "Toggle the hiding state of the current block"])) | ||
| 373 | map) | 358 | map) |
| 374 | "Keymap for hideshow minor mode.") | 359 | "Keymap for hideshow minor mode.") |
| 375 | 360 | ||
| 361 | (easy-menu-define hs-minor-mode-menu hs-minor-mode-map | ||
| 362 | "Menu used when hideshow minor mode is active." | ||
| 363 | '("Hide/Show" | ||
| 364 | ["Hide Block" hs-hide-block | ||
| 365 | :help "Hide the code or comment block at point"] | ||
| 366 | ["Show Block" hs-show-block | ||
| 367 | :help "Show the code or comment block at point"] | ||
| 368 | ["Hide All" hs-hide-all | ||
| 369 | :help "Hide all the blocks in the buffer"] | ||
| 370 | ["Show All" hs-show-all | ||
| 371 | :help "Show all the clocks in the buffer"] | ||
| 372 | ["Hide Level" hs-hide-level | ||
| 373 | :help "Hide all block at levels below the current block"] | ||
| 374 | ["Toggle Hiding" hs-toggle-hiding | ||
| 375 | :help "Toggle the hiding state of the current block"])) | ||
| 376 | |||
| 376 | (defvar hs-c-start-regexp nil | 377 | (defvar hs-c-start-regexp nil |
| 377 | "Regexp for beginning of comments. | 378 | "Regexp for beginning of comments. |
| 378 | Differs from mode-specific comment regexps in that | 379 | Differs from mode-specific comment regexps in that |