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.

diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index 3e0d502..27a8ba9 100644 (file)
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -235,7 +235,7 @@ Move backward one word (@code{backward-word}).
 @kindex C-LEFT
 @kindex M-LEFT
 @findex left-word
-This command (@code{left-word}) behaves like @kbd{M-f}, except it
+This command (@code{left-word}) behaves like @kbd{M-b}, except it
 moves @emph{forward} by one word if the current paragraph is
 right-to-left.  @xref{Bidirectional Editing}.
 

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 78d7531..b38256a 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-31  Juri Linkov  <juri@jurta.org>
+
+       * searching.texi (String Search): Incremental word search fixes.
+
 2014-01-28  Glenn Morris  <rgm@gnu.org>
 
        * text.texi (Indent Tabs): Update related to tab-stops.

diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 623261f..2f287cc 100644 (file)
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -137,7 +137,7 @@ the ball boy!"
 
 @group
 (word-search-forward "Please find the ball, boy.")
-     @result{} 36
+     @result{} 39
 
 ---------- Buffer: foo ----------
 He said "Please!  Find
@@ -160,16 +160,17 @@ If @var{repeat} is non-@code{nil}, then the search is repeated that many
 times.  Point is positioned at the end of the last match.
 
 @findex word-search-regexp
-Internal, @code{word-search-forward} and related functions use the
+Internally, @code{word-search-forward} and related functions use the
 function @code{word-search-regexp} to convert @var{string} to a
 regular expression that ignores punctuation.
 @end deffn
 
 @deffn Command word-search-forward-lax string &optional limit noerror repeat
 This command is identical to @code{word-search-forward}, except that
-the end of @var{string} need not match a word boundary, unless @var{string} ends
-in whitespace.  For instance, searching for @samp{ball boy} matches
-@samp{ball boyee}, but does not match @samp{aball boy}.
+the beginning or the end of @var{string} need not match a word
+boundary, unless @var{string} begins or ends in whitespace.
+For instance, searching for @samp{ball boy} matches @samp{ball boyee},
+but does not match @samp{balls boy}.
 @end deffn
 
 @deffn Command word-search-backward string &optional limit noerror repeat
@@ -181,8 +182,8 @@ beginning of the match.
 
 @deffn Command word-search-backward-lax string &optional limit noerror repeat
 This command is identical to @code{word-search-backward}, except that
-the end of @var{string} need not match a word boundary, unless @var{string} ends
-in whitespace.
+the beginning or the end of @var{string} need not match a word
+boundary, unless @var{string} begins or ends in whitespace.
 @end deffn
 
 @node Searching and Case

diff --git a/etc/NEWS b/etc/NEWS
index c17eb3e..b9bf674 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -244,11 +244,11 @@ and this variable has been marked obsolete.
 ** `emacs-bzr-version' has been renamed to `emacs-repository-version',
 and works for git too, if you fetch the repository notes.
 
-** `read-regexp-defaults-function' defines a function to read regexps,
-used by commands like `rgrep', `lgrep' `occur', `highlight-regexp', etc.
-You can customize this to specify a function that provides a default
-value from the regexp last history element, or from the symbol found
-at point.
+** `read-regexp-defaults-function' defines a function to provide default
+values for reading regexps by commands like `rgrep', `lgrep' `occur',
+`highlight-regexp', etc.  You can customize this to specify a function
+that provides a default value from the regexp last history element,
+or from the symbol found at point.
 
 +++
 ** New option `load-prefer-newer' affects how the `load' function chooses

diff --git a/etc/grep.txt b/etc/grep.txt
index 564893d..523b1fa 100644 (file)
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -72,13 +72,18 @@ Grep finished (matches found) at Thu Jul 21 15:02:15
 agrep -n "INFO tree" ../info/*
 ../info/dir: 6: File: dir      Node: Top       This is the top of the INFO tree
 
+* bzr grep with Bazaar plugin [grep]
+
+bzr grep --color=always -in "org-element-map"
+\e[35mlisp/org/org.el\e[1;36m:\e[0m21047\e[1;36m:\e[0m                    (\e[1;31morg-element-map\e[0m
+
 * git-grep
   with `[diff "el"] xfuncname = "^(\\(.*)$"' in .gitconfig
   and `*.el diff=el' in .gitattributes
 
-git grep -inH -p -e "org-element-map"
-lisp/org/org.el=20969=(defun org-fill-paragraph (&optional justify)
-lisp/org/org.el:21047:               (org-element-map
+git --no-pager grep -inH -p -e "org-element-map"
+lisp/org/org.el\e[36m=\e[m20969\e[36m=\e[m(defun org-fill-paragraph (&optional justify)
+lisp/org/org.el\e[36m:\e[m21047\e[36m:\e[m               (\e[1;31morg-element-map\e[m
 
 * unknown greps
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f032b06..0a60968 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-01-31  Juri Linkov  <juri@jurta.org>
+
+       * sort.el (delete-duplicate-lines): Remove `:weakness 'key'
+       from `make-hash-table'.
+
+       * textmodes/ispell.el (ispell-init-process): Change message format
+       to be consistent with other messages.
+
 2014-01-31  Glenn Morris  <rgm@gnu.org>
 
        * delsel.el (delete-selection-mode): Doc fix.

diff --git a/lisp/sort.el b/lisp/sort.el
index 1523450..dbc641e 100644 (file)
--- 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."
           (equal current-prefix-arg '(16))
           (equal current-prefix-arg '(64))
           t)))
-  (let ((lines (unless adjacent (make-hash-table :weakness 'key :test 'equal)))
+  (let ((lines (unless adjacent (make-hash-table :test 'equal)))
        line prev-line
        (count 0)
        (beg (copy-marker beg))

diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 0509387..5cdae22 100644 (file)
--- 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."
        (setq ispell-filter nil ispell-filter-continue nil)
       ;; may need to restart to select new personal dictionary.
       (ispell-kill-ispell t)
-      (message "Starting new Ispell process [%s::%s] ..."
+      (message "Starting new Ispell process %s with %s dictionary..."
               ispell-program-name
               (or ispell-local-dictionary ispell-dictionary "default"))
       (sit-for 0)

diff --git a/src/callint.c b/src/callint.c
index aedb363..35411bf 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -308,7 +308,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
 
   specs = Qnil;
   string = 0;
-  /* The idea of FILTER_SPECS is to provide away to
+  /* The idea of FILTER_SPECS is to provide a way to
      specify how to represent the arguments in command history.
      The feature is not fully implemented.  */
   filter_specs = Qnil;

diff --git a/src/data.c b/src/data.c
index 91a1d8b..a52cee6 100644 (file)
--- a/src/data.c
+++ b/src/data.c
@@ -2365,7 +2365,7 @@ usage: (<= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS)  */)
 DEFUN (">=", Fgeq, Sgeq, 1, MANY, 0,
        doc: /* Return t if each arg is greater than or equal to the next arg.
 All must be numbers or markers.
-usage: (= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS)  */)
+usage: (>= NUMBER-OR-MARKER &rest NUMBERS-OR-MARKERS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
   return arithcompare_driver (nargs, args, ARITH_GRTR_OR_EQUAL);