diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/progmodes/asm-mode.el | |
parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/progmodes/asm-mode.el')
-rw-r--r-- | lisp/progmodes/asm-mode.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el index 99b2ec6d87e..2f7d7bf7966 100644 --- a/lisp/progmodes/asm-mode.el +++ b/lisp/progmodes/asm-mode.el @@ -73,19 +73,19 @@ ;; Note that the comment character isn't set up until asm-mode is called. (define-key map ":" 'asm-colon) (define-key map "\C-c;" 'comment-region) - (define-key map [menu-bar asm-mode] (cons "Asm" (make-sparse-keymap))) - (define-key map [menu-bar asm-mode comment-region] - '(menu-item "Comment Region" comment-region - :help "Comment or uncomment each line in the region")) - (define-key map [menu-bar asm-mode newline-and-indent] - '(menu-item "Insert Newline and Indent" newline-and-indent - :help "Insert a newline, then indent according to major mode")) - (define-key map [menu-bar asm-mode asm-colon] - '(menu-item "Insert Colon" asm-colon - :help "Insert a colon; if it follows a label, delete the label's indentation")) map) "Keymap for Asm mode.") +(easy-menu-define asm-mode-menu asm-mode-map + "Menu for Asm mode." + '("Asm" + ["Insert Colon" asm-colon + :help "Insert a colon; if it follows a label, delete the label's indentation"] + ["Insert Newline and Indent" newline-and-indent + :help "Insert a newline, then indent according to major mode"] + ["Comment Region" comment-region + :help "Comment or uncomment each line in the region"])) + (defconst asm-font-lock-keywords (append '(("^\\(\\(\\sw\\|\\s_\\)+\\)\\>:?[ \t]*\\(\\sw+\\(\\.\\sw+\\)*\\)?" |