aboutsummaryrefslogtreecommitdiffstats
path: root/src/lread.c
diff options
context:
space:
mode:
authorPaul Eggert2016-11-04 15:02:03 -0700
committerPaul Eggert2016-11-04 15:02:03 -0700
commitae0a1a890ec7b885e85cd945a21ca42fed80df3d (patch)
tree495f1d851cb3a43a0e677bff9c09d4211a35fbde /src/lread.c
parent66b5222c3cd72839bf72e0b2a03912719c930451 (diff)
parentacae275b2752357497a2411876b83240ce7c8aec (diff)
downloademacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.tar.gz
emacs-ae0a1a890ec7b885e85cd945a21ca42fed80df3d.zip
Merge from origin/emacs-25
acae275 ; Spelling fixes d8fac73 Update README for precompiled windows Emacs. 23570fd Clarify documentation of 'vc-responsible-backend' wrt symlinks f708cb2 Clarify doc string of 'transpose-sexps' cd05b1d Fix docstring of 'browse-url-firefox-new-window-is-tab' bdc89eb Improve documentation of 'font-lock-remove-keywords' 4a0c590 Fix documentation of the command summary key 0221b7a Mark relocation workarounds with REL_ALLOC
Diffstat (limited to 'src/lread.c')
-rw-r--r--src/lread.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lread.c b/src/lread.c
index 58d518ce40b..eab9b8bea08 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -2574,7 +2574,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
2574 c = READCHAR; 2574 c = READCHAR;
2575 if (c == '(') 2575 if (c == '(')
2576 { 2576 {
2577 /* Accept extended format for hashtables (extensible to 2577 /* Accept extended format for hash tables (extensible to
2578 other types), e.g. 2578 other types), e.g.
2579 #s(hash-table size 2 test equal data (k1 v1 k2 v2)) */ 2579 #s(hash-table size 2 test equal data (k1 v1 k2 v2)) */
2580 Lisp_Object tmp = read_list (0, readcharfun); 2580 Lisp_Object tmp = read_list (0, readcharfun);
@@ -2620,10 +2620,10 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
2620 if (!NILP (params[param_count + 1])) 2620 if (!NILP (params[param_count + 1]))
2621 param_count += 2; 2621 param_count += 2;
2622 2622
2623 /* This is the hashtable data. */ 2623 /* This is the hash table data. */
2624 data = Fplist_get (tmp, Qdata); 2624 data = Fplist_get (tmp, Qdata);
2625 2625
2626 /* Now use params to make a new hashtable and fill it. */ 2626 /* Now use params to make a new hash table and fill it. */
2627 ht = Fmake_hash_table (param_count, params); 2627 ht = Fmake_hash_table (param_count, params);
2628 2628
2629 while (CONSP (data)) 2629 while (CONSP (data))
@@ -2631,7 +2631,7 @@ read1 (Lisp_Object readcharfun, int *pch, bool first_in_list)
2631 key = XCAR (data); 2631 key = XCAR (data);
2632 data = XCDR (data); 2632 data = XCDR (data);
2633 if (!CONSP (data)) 2633 if (!CONSP (data))
2634 error ("Odd number of elements in hashtable data"); 2634 error ("Odd number of elements in hash table data");
2635 val = XCAR (data); 2635 val = XCAR (data);
2636 data = XCDR (data); 2636 data = XCDR (data);
2637 Fputhash (key, val, ht); 2637 Fputhash (key, val, ht);