; Small fixes and indentation

diff --git a/ChangeLog.2 b/ChangeLog.2
index 22c7e0116ba29c02d434d16d81cfc07137d1fc9f..356fbc788f30920bddcc9b33c514b6c7502bf433 100644 (file)
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -25940,9 +25940,9 @@
 2015-08-19  Artur Malabarba  <bruce.connor.am@gmail.com>
 
        * lisp/isearch.el (isearch-search-fun-default): Revert a5bdb87
-       Remove usage of `isearch-lax-whitespace' inside the `iearch-word'
+       Remove usage of `isearch-lax-whitespace' inside the `isearch-word'
        clause of `isearch-search-fun-default'.  That lax variable does not
-       refer to lax-whitespacing.  Related to (bug#21777).
+       refer to lax-whitespacing.  Related to (bug#21277).
        This reverts commit a5bdb872edb9f031fe041faf9a8c0be432e5f64c.
        * lisp/character-fold.el (character-fold-search): Set to nil.
        Default to nil for now, until someone implements proper
@@ -29096,7 +29096,7 @@
        * lisp/isearch.el: Move character-folding code to
        character-fold.el
        (isearch-toggle-character-fold): New command.
-       (isearch-mode-map): Bind it to "\M-sf".
+       (isearch-mode-map): Bind it to "\M-s'".
        (isearch-mode): Check value of `character-fold-search'.
 
 2015-06-24  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 729f629423c175ebec7938c6ea2a150edfd0857d..41350c2d303300a3d1277fb53792636120b48a2f 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -589,8 +589,8 @@ variable by the command `isearch-toggle-lax-whitespace'.")
 (defvar isearch-cmds nil
   "Stack of search status elements.
 Each element is an `isearch--state' struct where the slots are
- [STRING MESSAGE POINT SUCCESS FORWARD OTHER-END WORD
-  ERROR WRAPPED BARRIER CASE-FOLD-SEARCH]")
+ [STRING MESSAGE POINT SUCCESS FORWARD OTHER-END WORD/REGEXP-FUNCTION
+  ERROR WRAPPED BARRIER CASE-FOLD-SEARCH POP-FUN]")
 
 (defvar isearch-string "")  ; The current search string.
 (defvar isearch-message "") ; text-char-description version of isearch-string

diff --git a/lisp/replace.el b/lisp/replace.el
index c6892328d71d889c29b84ebc43b5e5e7d4713460..c28c9b36f055cd77c48da5b945fe9ad8e9b99ae1 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -39,7 +39,7 @@
 (defcustom replace-char-fold nil
   "Non-nil means replacement commands should do character folding in matches.
 This means, for instance, that \\=' will match a large variety of
-unicode quotes.
+Unicode quotes.
 This variable affects `query-replace' and `replace-string', but not
 `replace-regexp'."
   :type 'boolean
@@ -1638,11 +1638,11 @@ See also `multi-occur'."
                (inhibit-field-text-motion t)
                (headerpt (with-current-buffer out-buf (point))))
            (with-current-buffer buf
-              ;; The following binding is for when case-fold-search
-              ;; has a local binding in the original buffer, in which
-              ;; case we cannot bind it globally and let that have
-              ;; effect in every buffer we search.
-              (let ((case-fold-search case-fold))
+             ;; The following binding is for when case-fold-search
+             ;; has a local binding in the original buffer, in which
+             ;; case we cannot bind it globally and let that have
+             ;; effect in every buffer we search.
+             (let ((case-fold-search case-fold))
                (or coding
                    ;; Set CODING only if the current buffer locally
                    ;; binds buffer-file-coding-system.
@@ -1708,9 +1708,9 @@ See also `multi-occur'."
                                                     ;; at the end of the prefix
                                                     ;; (for Occur Edit mode).
                                                     front-sticky t
-                                                     rear-nonsticky t
-                                                    occur-target ,marker
-                                                     follow-link t
+                                                    rear-nonsticky t
+                                                    occur-target ,marker
+                                                    follow-link t
                                                     help-echo "mouse-2: go to this occurrence"))))
                             (match-str
                              ;; We don't put `mouse-face' on the newline,
@@ -1730,7 +1730,7 @@ See also `multi-occur'."
                                "\n"
                                (if prefix-face
                                    (propertize
-                                     "\n       :" 'font-lock-face prefix-face)
+                                    "\n       :" 'font-lock-face prefix-face)
                                  "\n       :")
                                match-str)
                               ;; Add marker at eol, but no mouse props.
@@ -1777,7 +1777,7 @@ See also `multi-occur'."
                          (setq curr-line (+ curr-line (count-lines begpt endpt)
                                             ;; Add 1 for empty last match line
                                             ;; since count-lines returns one
-                                             ;; line less.
+                                            ;; line less.
                                             (if (and (bolp) (eolp)) 1 0)))
                          ;; On to the next match...
                          (forward-line 1))
@@ -1820,16 +1820,16 @@ See also `multi-occur'."
                                     (if (= lines matches)
                                         "" (format " in %d line%s"
                                                    lines
-                                                    (if (= lines 1) "" "s")))
+                                                   (if (= lines 1) "" "s")))
                                     ;; Don't display regexp for multi-buffer.
                                     (if (> (length buffers) 1)
                                         "" (occur-regexp-descr regexp))
                                     (buffer-name buf)
-                                     (if in-region-p
-                                         (format " within region: %d-%d"
-                                                 occur--region-start
-                                                 occur--region-end)
-                                       ""))
+                                    (if in-region-p
+                                        (format " within region: %d-%d"
+                                                occur--region-start
+                                                occur--region-end)
+                                      ""))
                             'read-only t))
                    (setq end (point))
                    (add-text-properties beg end `(occur-title ,buf))
@@ -2220,9 +2220,9 @@ It is called with three arguments, as if it were
   ;; used after `recursive-edit' might override them.
   (let* ((isearch-regexp regexp-flag)
         (isearch-regexp-function (or delimited-flag
-                           (and replace-char-fold
-                                (not regexp-flag)
-                                #'char-fold-to-regexp)))
+                                     (and replace-char-fold
+                                          (not regexp-flag)
+                                          #'char-fold-to-regexp)))
         (isearch-lax-whitespace
          replace-lax-whitespace)
         (isearch-regexp-lax-whitespace