diff options
author | Vibhav Pant <vibhavp@gmail.com> | 2017-01-30 18:35:43 +0530 |
---|---|---|
committer | Vibhav Pant <vibhavp@gmail.com> | 2017-01-30 18:35:43 +0530 |
commit | bf7f7c0d82a56ed1b76358657e74ca2833b19fe2 (patch) | |
tree | 90f357b4a735ca7c90d1881ef9948186b9f919df /src/buffer.c | |
parent | 25d38a06eceb0853190a2d9acf53d85686f524bd (diff) | |
parent | 9c4dfdd1af9f97c6a8d7e922b68a39052116790c (diff) | |
download | emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.tar.gz emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.tar.bz2 emacs-bf7f7c0d82a56ed1b76358657e74ca2833b19fe2.zip |
Merge remote-tracking branch 'origin/master' into feature/byte-switch
Diffstat (limited to 'src/buffer.c')
-rw-r--r-- | src/buffer.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/buffer.c b/src/buffer.c index fde23cace1a..c00cc40d6f2 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -415,19 +415,16 @@ followed by the rest of the buffers. */) } /* Like Fassoc, but use Fstring_equal to compare - (which ignores text properties), - and don't ever QUIT. */ + (which ignores text properties), and don't ever quit. */ static Lisp_Object -assoc_ignore_text_properties (register Lisp_Object key, Lisp_Object list) +assoc_ignore_text_properties (Lisp_Object key, Lisp_Object list) { - register Lisp_Object tail; + Lisp_Object tail; for (tail = list; CONSP (tail); tail = XCDR (tail)) { - register Lisp_Object elt, tem; - elt = XCAR (tail); - tem = Fstring_equal (Fcar (elt), key); - if (!NILP (tem)) + Lisp_Object elt = XCAR (tail); + if (!NILP (Fstring_equal (Fcar (elt), key))) return elt; } return Qnil; |