diff options
| author | Paul Eggert | 2016-11-04 15:02:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-11-04 15:02:03 -0700 |
| commit | ae0a1a890ec7b885e85cd945a21ca42fed80df3d (patch) | |
| tree | 495f1d851cb3a43a0e677bff9c09d4211a35fbde /etc | |
| parent | 66b5222c3cd72839bf72e0b2a03912719c930451 (diff) | |
| parent | acae275b2752357497a2411876b83240ce7c8aec (diff) | |
| download | emacs-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 'etc')
| -rw-r--r-- | etc/ERC-NEWS | 2 | ||||
| -rw-r--r-- | etc/NEWS.23 | 2 | ||||
| -rw-r--r-- | etc/TODO | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 13827c67786..69b846884fe 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS | |||
| @@ -1077,7 +1077,7 @@ major changes for implementers, and module writers: | |||
| 1077 | corresponding hook variables. | 1077 | corresponding hook variables. |
| 1078 | 1078 | ||
| 1079 | The mapping of server commands to hook variables is no longer | 1079 | The mapping of server commands to hook variables is no longer |
| 1080 | done via `erc-event-to-hook', but through an #'equal hashtable, | 1080 | done via `erc-event-to-hook', but through an #'equal hash table, |
| 1081 | `erc-server-responses'. In order to find a hook you do: | 1081 | `erc-server-responses'. In order to find a hook you do: |
| 1082 | 1082 | ||
| 1083 | (erc-get-hook command) | 1083 | (erc-get-hook command) |
diff --git a/etc/NEWS.23 b/etc/NEWS.23 index d92bf237979..f74141db49a 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 | |||
| @@ -551,7 +551,7 @@ System (CLOS). It is used by the other CEDET packages. | |||
| 551 | 551 | ||
| 552 | ** js.el is a new major mode for JavaScript files. | 552 | ** js.el is a new major mode for JavaScript files. |
| 553 | 553 | ||
| 554 | ** imap-hash.el is a new library to address IMAP mailboxes as hashtables. | 554 | ** imap-hash.el is a new library to address IMAP mailboxes as hash tables. |
| 555 | 555 | ||
| 556 | 556 | ||
| 557 | * Incompatible Lisp Changes in Emacs 23.2 | 557 | * Incompatible Lisp Changes in Emacs 23.2 |
| @@ -38,7 +38,7 @@ stay within exec_byte_code. | |||
| 38 | ** Add new 'switch' byte-code | 38 | ** Add new 'switch' byte-code |
| 39 | This byte-code would take one argument from the stack (the object to test) | 39 | This byte-code would take one argument from the stack (the object to test) |
| 40 | and one argument from the constant-pool (a switch table, implemented as an | 40 | and one argument from the constant-pool (a switch table, implemented as an |
| 41 | eq-hashtable) and would jump to the "label" contained in the hashtable. | 41 | 'eq' hash table) and would jump to the "label" contained in the hash table. |
| 42 | 42 | ||
| 43 | Then add a 'case' special-form that can be compiled to this byte-code. | 43 | Then add a 'case' special-form that can be compiled to this byte-code. |
| 44 | This would behave just like cl-case, but instead of expanding to cond+eq it | 44 | This would behave just like cl-case, but instead of expanding to cond+eq it |