summaryrefslogtreecommitdiff
path: root/lisp/progmodes/ld-script.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-05-08 12:27:53 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-05-08 12:27:53 -0400
commit1d5963cc63979c4a19b5de3b9b537c1b3b61dda3 (patch)
treead1c4bba72a8c023dabbe48afd2e6692a09b2cc6 /lisp/progmodes/ld-script.el
parent86cec478835929993c71982c8da72594f0017950 (diff)
downloademacs-1d5963cc63979c4a19b5de3b9b537c1b3b61dda3.tar.gz
* lisp/progmodes/f90.el (f90-mode-syntax-table): Use symbol syntax for "_".
Change all regexps to use things like \_< and \_>. * lisp/progmodes/ada-mode.el (ada-mode-abbrev-table): Consolidate declaration. (ada-mode-syntax-table, ada-mode-symbol-syntax-table): Initialize in the declaration. (ada-create-syntax-table): Remove. (ada-capitalize-word): Don't mess with the syntax of "_" since it already has the right syntax nowadays. (ada-goto-next-word): Don't change the syntax of "_". * lisp/progmodes/autoconf.el (autoconf-definition-regexp) (autoconf-font-lock-keywords, autoconf-current-defun-function): Handle a _ with symbol syntax. (autoconf-mode): Don't change the syntax-table for imenu and font-lock. * lisp/progmodes/vera-mode.el (vera-underscore-is-part-of-word): * lisp/progmodes/prolog.el (prolog-underscore-wordchar-flag) (prolog-char-quote-workaround): * lisp/progmodes/cperl-mode.el (cperl-under-as-char): * lisp/progmodes/vhdl-mode.el (vhdl-underscore-is-part-of-word): Mark as obsolete. (vhdl-mode-syntax-table, vhdl-mode-ext-syntax-table): Initialize in their declaration. (vhdl-mode-syntax-table-init): Remove. * lisp/progmodes/ld-script.el (ld-script-mode-syntax-table): Use symbol syntax for "_". (ld-script-font-lock-keywords): Change regexps to use things like \_< and \_>. * lisp/progmodes/m4-mode.el (m4-mode-syntax-table): Add comment on last change. * lisp/font-lock.el (lisp-font-lock-keywords-2): Don't highlight obsolete with-wrapper-hook. * lisp/mh-e/mh-comp.el (mh-regexp-in-field-p): Minor simplification.
Diffstat (limited to 'lisp/progmodes/ld-script.el')
-rw-r--r--lisp/progmodes/ld-script.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 34d1525bbab..ffb425ee1e9 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -48,7 +48,7 @@
(modify-syntax-entry ?\) ")(" st)
(modify-syntax-entry ?\[ "(]" st)
(modify-syntax-entry ?\] ")[" st)
- (modify-syntax-entry ?_ "w" st)
+ (modify-syntax-entry ?_ "_" st)
(modify-syntax-entry ?. "_" st)
(modify-syntax-entry ?\\ "\\" st)
(modify-syntax-entry ?: "." st)
@@ -154,10 +154,10 @@
(defvar ld-script-font-lock-keywords
(append
- `((,(regexp-opt ld-script-keywords 'words)
- 1 font-lock-keyword-face)
- (,(regexp-opt ld-script-builtins 'words)
- 1 font-lock-builtin-face)
+ `((,(concat "\\_<" (regexp-opt ld-script-keywords) "\\_>")
+ 0 font-lock-keyword-face)
+ (,(concat "\\_<" (regexp-opt ld-script-builtins) "\\_>")
+ 0 font-lock-builtin-face)
;; 3.6.7 Output Section Discarding
;; 3.6.4.1 Input Section Basics
;; 3.6.8.7 Output Section Phdr