diff options
| author | Juri Linkov | 2014-01-31 11:41:54 +0200 |
|---|---|---|
| committer | Juri Linkov | 2014-01-31 11:41:54 +0200 |
| commit | bd21bf41c00ea85de7bba7440a4ee70fa934cdb9 (patch) | |
| tree | c77ddae81fdeb304fbbf0f3e2eceddcee337bf18 | |
| parent | 579d49fa6ef7eb66fb6a042251f95d2fa94d2e3b (diff) | |
| download | emacs-bd21bf41c00ea85de7bba7440a4ee70fa934cdb9.tar.gz emacs-bd21bf41c00ea85de7bba7440a4ee70fa934cdb9.zip | |
Misc small fixes.
* doc/lispref/searching.texi (String Search): Incremental word search fixes.
* lisp/sort.el (delete-duplicate-lines): Remove `:weakness 'key'
from `make-hash-table'.
* lisp/textmodes/ispell.el (ispell-init-process): Change message format
to be consistent with other messages.
| -rw-r--r-- | doc/emacs/basic.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/searching.texi | 15 | ||||
| -rw-r--r-- | etc/NEWS | 10 | ||||
| -rw-r--r-- | etc/grep.txt | 11 | ||||
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/sort.el | 2 | ||||
| -rw-r--r-- | lisp/textmodes/ispell.el | 2 | ||||
| -rw-r--r-- | src/callint.c | 2 | ||||
| -rw-r--r-- | src/data.c | 2 |
10 files changed, 38 insertions, 20 deletions
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi index 3e0d50255b2..27a8ba9438e 100644 --- a/doc/emacs/basic.texi +++ b/doc/emacs/basic.texi | |||
| @@ -235,7 +235,7 @@ Move backward one word (@code{backward-word}). | |||
| 235 | @kindex C-LEFT | 235 | @kindex C-LEFT |
| 236 | @kindex M-LEFT | 236 | @kindex M-LEFT |
| 237 | @findex left-word | 237 | @findex left-word |
| 238 | This command (@code{left-word}) behaves like @kbd{M-f}, except it | 238 | This command (@code{left-word}) behaves like @kbd{M-b}, except it |
| 239 | moves @emph{forward} by one word if the current paragraph is | 239 | moves @emph{forward} by one word if the current paragraph is |
| 240 | right-to-left. @xref{Bidirectional Editing}. | 240 | right-to-left. @xref{Bidirectional Editing}. |
| 241 | 241 | ||
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 78d7531f869..b38256a4492 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-01-31 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * searching.texi (String Search): Incremental word search fixes. | ||
| 4 | |||
| 1 | 2014-01-28 Glenn Morris <rgm@gnu.org> | 5 | 2014-01-28 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * text.texi (Indent Tabs): Update related to tab-stops. | 7 | * text.texi (Indent Tabs): Update related to tab-stops. |
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 623261f3049..2f287cc9705 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi | |||
| @@ -137,7 +137,7 @@ the ball boy!" | |||
| 137 | 137 | ||
| 138 | @group | 138 | @group |
| 139 | (word-search-forward "Please find the ball, boy.") | 139 | (word-search-forward "Please find the ball, boy.") |
| 140 | @result{} 36 | 140 | @result{} 39 |
| 141 | 141 | ||
| 142 | ---------- Buffer: foo ---------- | 142 | ---------- Buffer: foo ---------- |
| 143 | He said "Please! Find | 143 | He said "Please! Find |
| @@ -160,16 +160,17 @@ If @var{repeat} is non-@code{nil}, then the search is repeated that many | |||
| 160 | times. Point is positioned at the end of the last match. | 160 | times. Point is positioned at the end of the last match. |
| 161 | 161 | ||
| 162 | @findex word-search-regexp | 162 | @findex word-search-regexp |
| 163 | Internal, @code{word-search-forward} and related functions use the | 163 | Internally, @code{word-search-forward} and related functions use the |
| 164 | function @code{word-search-regexp} to convert @var{string} to a | 164 | function @code{word-search-regexp} to convert @var{string} to a |
| 165 | regular expression that ignores punctuation. | 165 | regular expression that ignores punctuation. |
| 166 | @end deffn | 166 | @end deffn |
| 167 | 167 | ||
| 168 | @deffn Command word-search-forward-lax string &optional limit noerror repeat | 168 | @deffn Command word-search-forward-lax string &optional limit noerror repeat |
| 169 | This command is identical to @code{word-search-forward}, except that | 169 | This command is identical to @code{word-search-forward}, except that |
| 170 | the end of @var{string} need not match a word boundary, unless @var{string} ends | 170 | the beginning or the end of @var{string} need not match a word |
| 171 | in whitespace. For instance, searching for @samp{ball boy} matches | 171 | boundary, unless @var{string} begins or ends in whitespace. |
| 172 | @samp{ball boyee}, but does not match @samp{aball boy}. | 172 | For instance, searching for @samp{ball boy} matches @samp{ball boyee}, |
| 173 | but does not match @samp{balls boy}. | ||
| 173 | @end deffn | 174 | @end deffn |
| 174 | 175 | ||
| 175 | @deffn Command word-search-backward string &optional limit noerror repeat | 176 | @deffn Command word-search-backward string &optional limit noerror repeat |
| @@ -181,8 +182,8 @@ beginning of the match. | |||
| 181 | 182 | ||
| 182 | @deffn Command word-search-backward-lax string &optional limit noerror repeat | 183 | @deffn Command word-search-backward-lax string &optional limit noerror repeat |
| 183 | This command is identical to @code{word-search-backward}, except that | 184 | This command is identical to @code{word-search-backward}, except that |
| 184 | the end of @var{string} need not match a word boundary, unless @var{string} ends | 185 | the beginning or the end of @var{string} need not match a word |
| 185 | in whitespace. | 186 | boundary, unless @var{string} begins or ends in whitespace. |
| 186 | @end deffn | 187 | @end deffn |
| 187 | 188 | ||
| 188 | @node Searching and Case | 189 | @node Searching and Case |
| @@ -244,11 +244,11 @@ and this variable has been marked obsolete. | |||
| 244 | ** `emacs-bzr-version' has been renamed to `emacs-repository-version', | 244 | ** `emacs-bzr-version' has been renamed to `emacs-repository-version', |
| 245 | and works for git too, if you fetch the repository notes. | 245 | and works for git too, if you fetch the repository notes. |
| 246 | 246 | ||
| 247 | ** `read-regexp-defaults-function' defines a function to read regexps, | 247 | ** `read-regexp-defaults-function' defines a function to provide default |
| 248 | used by commands like `rgrep', `lgrep' `occur', `highlight-regexp', etc. | 248 | values for reading regexps by commands like `rgrep', `lgrep' `occur', |
| 249 | You can customize this to specify a function that provides a default | 249 | `highlight-regexp', etc. You can customize this to specify a function |
| 250 | value from the regexp last history element, or from the symbol found | 250 | that provides a default value from the regexp last history element, |
| 251 | at point. | 251 | or from the symbol found at point. |
| 252 | 252 | ||
| 253 | +++ | 253 | +++ |
| 254 | ** New option `load-prefer-newer' affects how the `load' function chooses | 254 | ** New option `load-prefer-newer' affects how the `load' function chooses |
diff --git a/etc/grep.txt b/etc/grep.txt index 564893d5b3e..523b1fa404c 100644 --- a/etc/grep.txt +++ b/etc/grep.txt | |||
| @@ -72,13 +72,18 @@ Grep finished (matches found) at Thu Jul 21 15:02:15 | |||
| 72 | agrep -n "INFO tree" ../info/* | 72 | agrep -n "INFO tree" ../info/* |
| 73 | ../info/dir: 6: File: dir Node: Top This is the top of the INFO tree | 73 | ../info/dir: 6: File: dir Node: Top This is the top of the INFO tree |
| 74 | 74 | ||
| 75 | * bzr grep with Bazaar plugin [grep] | ||
| 76 | |||
| 77 | bzr grep --color=always -in "org-element-map" | ||
| 78 | [35mlisp/org/org.el[1;36m:[0m21047[1;36m:[0m ([1;31morg-element-map[0m | ||
| 79 | |||
| 75 | * git-grep | 80 | * git-grep |
| 76 | with `[diff "el"] xfuncname = "^(\\(.*)$"' in .gitconfig | 81 | with `[diff "el"] xfuncname = "^(\\(.*)$"' in .gitconfig |
| 77 | and `*.el diff=el' in .gitattributes | 82 | and `*.el diff=el' in .gitattributes |
| 78 | 83 | ||
| 79 | git grep -inH -p -e "org-element-map" | 84 | git --no-pager grep -inH -p -e "org-element-map" |
| 80 | lisp/org/org.el=20969=(defun org-fill-paragraph (&optional justify) | 85 | lisp/org/org.el[36m=[m20969[36m=[m(defun org-fill-paragraph (&optional justify) |
| 81 | lisp/org/org.el:21047: (org-element-map | 86 | lisp/org/org.el[36m:[m21047[36m:[m ([1;31morg-element-map[m |
| 82 | 87 | ||
| 83 | * unknown greps | 88 | * unknown greps |
| 84 | 89 | ||
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f032b06a7f7..0a609682d62 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2014-01-31 Juri Linkov <juri@jurta.org> | ||
| 2 | |||
| 3 | * sort.el (delete-duplicate-lines): Remove `:weakness 'key' | ||
| 4 | from `make-hash-table'. | ||
| 5 | |||
| 6 | * textmodes/ispell.el (ispell-init-process): Change message format | ||
| 7 | to be consistent with other messages. | ||
| 8 | |||
| 1 | 2014-01-31 Glenn Morris <rgm@gnu.org> | 9 | 2014-01-31 Glenn Morris <rgm@gnu.org> |
| 2 | 10 | ||
| 3 | * delsel.el (delete-selection-mode): Doc fix. | 11 | * delsel.el (delete-selection-mode): Doc fix. |
diff --git a/lisp/sort.el b/lisp/sort.el index 152345083fb..dbc641ece2f 100644 --- a/lisp/sort.el +++ b/lisp/sort.el | |||
| @@ -595,7 +595,7 @@ is non-nil, it also prints a message describing the number of deletions." | |||
| 595 | (equal current-prefix-arg '(16)) | 595 | (equal current-prefix-arg '(16)) |
| 596 | (equal current-prefix-arg '(64)) | 596 | (equal current-prefix-arg '(64)) |
| 597 | t))) | 597 | t))) |
| 598 | (let ((lines (unless adjacent (make-hash-table :weakness 'key :test 'equal))) | 598 | (let ((lines (unless adjacent (make-hash-table :test 'equal))) |
| 599 | line prev-line | 599 | line prev-line |
| 600 | (count 0) | 600 | (count 0) |
| 601 | (beg (copy-marker beg)) | 601 | (beg (copy-marker beg)) |
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 050938752ca..5cdae22cc0f 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el | |||
| @@ -3025,7 +3025,7 @@ Keeps argument list for future Ispell invocations for no async support." | |||
| 3025 | (setq ispell-filter nil ispell-filter-continue nil) | 3025 | (setq ispell-filter nil ispell-filter-continue nil) |
| 3026 | ;; may need to restart to select new personal dictionary. | 3026 | ;; may need to restart to select new personal dictionary. |
| 3027 | (ispell-kill-ispell t) | 3027 | (ispell-kill-ispell t) |
| 3028 | (message "Starting new Ispell process [%s::%s] ..." | 3028 | (message "Starting new Ispell process %s with %s dictionary..." |
| 3029 | ispell-program-name | 3029 | ispell-program-name |
| 3030 | (or ispell-local-dictionary ispell-dictionary "default")) | 3030 | (or ispell-local-dictionary ispell-dictionary "default")) |
| 3031 | (sit-for 0) | 3031 | (sit-for 0) |
diff --git a/src/callint.c b/src/callint.c index aedb363980f..35411bf9b5c 100644 --- a/src/callint.c +++ b/src/callint.c | |||
| @@ -308,7 +308,7 @@ invoke it. If KEYS is omitted or nil, the return value of | |||
| 308 | 308 | ||
| 309 | specs = Qnil; | 309 | specs = Qnil; |
| 310 | string = 0; | 310 | string = 0; |
| 311 | /* The idea of FILTER_SPECS is to provide away to | 311 | /* The idea of FILTER_SPECS is to provide a way to |
| 312 | specify how to represent the arguments in command history. | 312 | specify how to represent the arguments in command history. |
| 313 | The feature is not fully implemented. */ | 313 | The feature is not fully implemented. */ |
| 314 | filter_specs = Qnil; | 314 | filter_specs = Qnil; |
diff --git a/src/data.c b/src/data.c index 91a1d8b75fb..a52cee66b57 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -2365,7 +2365,7 @@ usage: (<= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) | |||
| 2365 | DEFUN (">=", Fgeq, Sgeq, 1, MANY, 0, | 2365 | DEFUN (">=", Fgeq, Sgeq, 1, MANY, 0, |
| 2366 | doc: /* Return t if each arg is greater than or equal to the next arg. | 2366 | doc: /* Return t if each arg is greater than or equal to the next arg. |
| 2367 | All must be numbers or markers. | 2367 | All must be numbers or markers. |
| 2368 | usage: (= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) | 2368 | usage: (>= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS) */) |
| 2369 | (ptrdiff_t nargs, Lisp_Object *args) | 2369 | (ptrdiff_t nargs, Lisp_Object *args) |
| 2370 | { | 2370 | { |
| 2371 | return arithcompare_driver (nargs, args, ARITH_GRTR_OR_EQUAL); | 2371 | return arithcompare_driver (nargs, args, ARITH_GRTR_OR_EQUAL); |