aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2011-06-28 14:09:43 +0200
committerDeniz Dogan2011-06-28 14:09:43 +0200
commitda68c4c88c9e505f622afe741e7533fda808f418 (patch)
treeae71b1e72aa72e8f82767e5c11fb3e36d4854679
parentec49bd31eafd898632fd864758cf954d2f90a44e (diff)
downloademacs-da68c4c88c9e505f622afe741e7533fda808f418.tar.gz
emacs-da68c4c88c9e505f622afe741e7533fda808f418.zip
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table): Unnest `let'.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/emacs-lisp/lisp-mode.el80
2 files changed, 43 insertions, 40 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 67ee29cd314..65eb59cca54 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-06-28 Deniz Dogan <deniz@dogan.se> 12011-06-28 Deniz Dogan <deniz@dogan.se>
2 2
3 * emacs-lisp/lisp-mode.el (emacs-lisp-mode-syntax-table): Unnest
4 `let'.
5
3 * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped 6 * textmodes/css-mode.el (css-font-lock-keywords): Fix grouped
4 selectors (Bug#5732). 7 selectors (Bug#5732).
5 (css-proprietary-nmstart-re): Use `regexp-opt'. 8 (css-proprietary-nmstart-re): Use `regexp-opt'.
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 04299aec099..114e9755039 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -38,46 +38,46 @@
38(define-abbrev-table 'lisp-mode-abbrev-table ()) 38(define-abbrev-table 'lisp-mode-abbrev-table ())
39 39
40(defvar emacs-lisp-mode-syntax-table 40(defvar emacs-lisp-mode-syntax-table
41 (let ((table (make-syntax-table))) 41 (let ((table (make-syntax-table))
42 (let ((i 0)) 42 (i 0))
43 (while (< i ?0) 43 (while (< i ?0)
44 (modify-syntax-entry i "_ " table) 44 (modify-syntax-entry i "_ " table)
45 (setq i (1+ i))) 45 (setq i (1+ i)))
46 (setq i (1+ ?9)) 46 (setq i (1+ ?9))
47 (while (< i ?A) 47 (while (< i ?A)
48 (modify-syntax-entry i "_ " table) 48 (modify-syntax-entry i "_ " table)
49 (setq i (1+ i))) 49 (setq i (1+ i)))
50 (setq i (1+ ?Z)) 50 (setq i (1+ ?Z))
51 (while (< i ?a) 51 (while (< i ?a)
52 (modify-syntax-entry i "_ " table) 52 (modify-syntax-entry i "_ " table)
53 (setq i (1+ i))) 53 (setq i (1+ i)))
54 (setq i (1+ ?z)) 54 (setq i (1+ ?z))
55 (while (< i 128) 55 (while (< i 128)
56 (modify-syntax-entry i "_ " table) 56 (modify-syntax-entry i "_ " table)
57 (setq i (1+ i))) 57 (setq i (1+ i)))
58 (modify-syntax-entry ?\s " " table) 58 (modify-syntax-entry ?\s " " table)
59 ;; Non-break space acts as whitespace. 59 ;; Non-break space acts as whitespace.
60 (modify-syntax-entry ?\x8a0 " " table) 60 (modify-syntax-entry ?\x8a0 " " table)
61 (modify-syntax-entry ?\t " " table) 61 (modify-syntax-entry ?\t " " table)
62 (modify-syntax-entry ?\f " " table) 62 (modify-syntax-entry ?\f " " table)
63 (modify-syntax-entry ?\n "> " table) 63 (modify-syntax-entry ?\n "> " table)
64 ;; This is probably obsolete since nowadays such features use overlays. 64 ;; This is probably obsolete since nowadays such features use overlays.
65 ;; ;; Give CR the same syntax as newline, for selective-display. 65 ;; ;; Give CR the same syntax as newline, for selective-display.
66 ;; (modify-syntax-entry ?\^m "> " table) 66 ;; (modify-syntax-entry ?\^m "> " table)
67 (modify-syntax-entry ?\; "< " table) 67 (modify-syntax-entry ?\; "< " table)
68 (modify-syntax-entry ?` "' " table) 68 (modify-syntax-entry ?` "' " table)
69 (modify-syntax-entry ?' "' " table) 69 (modify-syntax-entry ?' "' " table)
70 (modify-syntax-entry ?, "' " table) 70 (modify-syntax-entry ?, "' " table)
71 (modify-syntax-entry ?@ "' " table) 71 (modify-syntax-entry ?@ "' " table)
72 ;; Used to be singlequote; changed for flonums. 72 ;; Used to be singlequote; changed for flonums.
73 (modify-syntax-entry ?. "_ " table) 73 (modify-syntax-entry ?. "_ " table)
74 (modify-syntax-entry ?# "' " table) 74 (modify-syntax-entry ?# "' " table)
75 (modify-syntax-entry ?\" "\" " table) 75 (modify-syntax-entry ?\" "\" " table)
76 (modify-syntax-entry ?\\ "\\ " table) 76 (modify-syntax-entry ?\\ "\\ " table)
77 (modify-syntax-entry ?\( "() " table) 77 (modify-syntax-entry ?\( "() " table)
78 (modify-syntax-entry ?\) ")( " table) 78 (modify-syntax-entry ?\) ")( " table)
79 (modify-syntax-entry ?\[ "(] " table) 79 (modify-syntax-entry ?\[ "(] " table)
80 (modify-syntax-entry ?\] ")[ " table)) 80 (modify-syntax-entry ?\] ")[ " table)
81 table) 81 table)
82 "Syntax table used in `emacs-lisp-mode'.") 82 "Syntax table used in `emacs-lisp-mode'.")
83 83