aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorChong Yidong2012-09-08 22:23:01 +0800
committerChong Yidong2012-09-08 22:23:01 +0800
commit6dcef6eca79b118976211b05552880be2ddf014a (patch)
tree9cc3ed07ef27e620c14afe91c2c8193787f82834 /lisp
parentfa2bcf435d9774c0e8542ba36b11ef4722f9675c (diff)
downloademacs-6dcef6eca79b118976211b05552880be2ddf014a.tar.gz
emacs-6dcef6eca79b118976211b05552880be2ddf014a.zip
Introduce "raw syntax descriptor" terminology, and use it.
* syntax.texi (Syntax Table Internals): Define "raw syntax descriptor" terminology. (Syntax Descriptors): Mention raw syntax descriptors. * lisp/subr.el (syntax-after, syntax-class): Doc fix. * syntax.c (Fstring_to_syntax): Doc fix. Fixes: debbugs:12383
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/subr.el9
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e10fe9166e7..4d6210a16b9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-09-08 Chong Yidong <cyd@gnu.org>
2
3 * subr.el (syntax-after, syntax-class): Doc fix.
4
12012-09-08 Martin Rudalics <rudalics@gmx.at> 52012-09-08 Martin Rudalics <rudalics@gmx.at>
2 6
3 * window.el (display-buffer-in-previous-window): New buffer 7 * window.el (display-buffer-in-previous-window): New buffer
diff --git a/lisp/subr.el b/lisp/subr.el
index a3e0897e9fe..4f273a92a62 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3737,7 +3737,7 @@ from `standard-syntax-table' otherwise."
3737 table)) 3737 table))
3738 3738
3739(defun syntax-after (pos) 3739(defun syntax-after (pos)
3740 "Return the raw syntax of the char after POS. 3740 "Return the raw syntax descriptor for the char after POS.
3741If POS is outside the buffer's accessible portion, return nil." 3741If POS is outside the buffer's accessible portion, return nil."
3742 (unless (or (< pos (point-min)) (>= pos (point-max))) 3742 (unless (or (< pos (point-min)) (>= pos (point-max)))
3743 (let ((st (if parse-sexp-lookup-properties 3743 (let ((st (if parse-sexp-lookup-properties
@@ -3746,7 +3746,12 @@ If POS is outside the buffer's accessible portion, return nil."
3746 (aref (or st (syntax-table)) (char-after pos)))))) 3746 (aref (or st (syntax-table)) (char-after pos))))))
3747 3747
3748(defun syntax-class (syntax) 3748(defun syntax-class (syntax)
3749 "Return the syntax class part of the syntax descriptor SYNTAX. 3749 "Return the code for the syntax class described by SYNTAX.
3750
3751SYNTAX should be a raw syntax descriptor; the return value is a
3752integer which encodes the corresponding syntax class. See Info
3753node `(elisp)Syntax Table Internals' for a list of codes.
3754
3750If SYNTAX is nil, return nil." 3755If SYNTAX is nil, return nil."
3751 (and syntax (logand (car syntax) 65535))) 3756 (and syntax (logand (car syntax) 65535)))
3752 3757