diff options
| author | Joakim Verona | 2013-03-26 16:20:17 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:20:17 +0100 |
| commit | 6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8 (patch) | |
| tree | 4a58903b4c3d010e90fc37fe10ea4d9895876d01 /etc/NEWS | |
| parent | 62dd123f7c11ddbe156bc0e84dcb7ca1da5368bb (diff) | |
| parent | 48c226c2c2592e31a47559bd1689fcc4354d9479 (diff) | |
| download | emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.tar.gz emacs-6f6db22fc74ffb7fbdd4d805545b7e28cd59f0c8.zip | |
conflict resolve
Diffstat (limited to 'etc/NEWS')
| -rw-r--r-- | etc/NEWS | 6 |
1 files changed, 6 insertions, 0 deletions
| @@ -174,6 +174,12 @@ When toggling, it restores the frame's previous window configuration. | |||
| 174 | It also has an optional frame argument, which can be used by Lisp | 174 | It also has an optional frame argument, which can be used by Lisp |
| 175 | callers to fit the image to a frame other than the selected frame. | 175 | callers to fit the image to a frame other than the selected frame. |
| 176 | 176 | ||
| 177 | ** Info | ||
| 178 | |||
| 179 | *** New face `info-index-match' is used to highlight matches in index | ||
| 180 | entries displayed by `Info-index-next', `Info-virtual-index' and | ||
| 181 | `info-apropos'. | ||
| 182 | |||
| 177 | ** Isearch | 183 | ** Isearch |
| 178 | 184 | ||
| 179 | *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name | 185 | *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name |