aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/replace.el
diff options
context:
space:
mode:
authorJuri Linkov2018-02-06 23:24:42 +0200
committerJuri Linkov2018-02-06 23:24:42 +0200
commit109237e23a01901e70c70c41166ebefc26b1b24f (patch)
tree36fcd48ffdb714db8bac8145cbf16d0a04a21cd4 /lisp/replace.el
parent31350817ae6eda2e071dbc28f1f1edc50e5f3b0c (diff)
downloademacs-109237e23a01901e70c70c41166ebefc26b1b24f.tar.gz
emacs-109237e23a01901e70c70c41166ebefc26b1b24f.zip
; Small fixes and indentation
Diffstat (limited to 'lisp/replace.el')
-rw-r--r--lisp/replace.el40
1 files changed, 20 insertions, 20 deletions
diff --git a/lisp/replace.el b/lisp/replace.el
index c6892328d71..c28c9b36f05 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -39,7 +39,7 @@
39(defcustom replace-char-fold nil 39(defcustom replace-char-fold nil
40 "Non-nil means replacement commands should do character folding in matches. 40 "Non-nil means replacement commands should do character folding in matches.
41This means, for instance, that \\=' will match a large variety of 41This means, for instance, that \\=' will match a large variety of
42unicode quotes. 42Unicode quotes.
43This variable affects `query-replace' and `replace-string', but not 43This variable affects `query-replace' and `replace-string', but not
44`replace-regexp'." 44`replace-regexp'."
45 :type 'boolean 45 :type 'boolean
@@ -1638,11 +1638,11 @@ See also `multi-occur'."
1638 (inhibit-field-text-motion t) 1638 (inhibit-field-text-motion t)
1639 (headerpt (with-current-buffer out-buf (point)))) 1639 (headerpt (with-current-buffer out-buf (point))))
1640 (with-current-buffer buf 1640 (with-current-buffer buf
1641 ;; The following binding is for when case-fold-search 1641 ;; The following binding is for when case-fold-search
1642 ;; has a local binding in the original buffer, in which 1642 ;; has a local binding in the original buffer, in which
1643 ;; case we cannot bind it globally and let that have 1643 ;; case we cannot bind it globally and let that have
1644 ;; effect in every buffer we search. 1644 ;; effect in every buffer we search.
1645 (let ((case-fold-search case-fold)) 1645 (let ((case-fold-search case-fold))
1646 (or coding 1646 (or coding
1647 ;; Set CODING only if the current buffer locally 1647 ;; Set CODING only if the current buffer locally
1648 ;; binds buffer-file-coding-system. 1648 ;; binds buffer-file-coding-system.
@@ -1708,9 +1708,9 @@ See also `multi-occur'."
1708 ;; at the end of the prefix 1708 ;; at the end of the prefix
1709 ;; (for Occur Edit mode). 1709 ;; (for Occur Edit mode).
1710 front-sticky t 1710 front-sticky t
1711 rear-nonsticky t 1711 rear-nonsticky t
1712 occur-target ,marker 1712 occur-target ,marker
1713 follow-link t 1713 follow-link t
1714 help-echo "mouse-2: go to this occurrence")))) 1714 help-echo "mouse-2: go to this occurrence"))))
1715 (match-str 1715 (match-str
1716 ;; We don't put `mouse-face' on the newline, 1716 ;; We don't put `mouse-face' on the newline,
@@ -1730,7 +1730,7 @@ See also `multi-occur'."
1730 "\n" 1730 "\n"
1731 (if prefix-face 1731 (if prefix-face
1732 (propertize 1732 (propertize
1733 "\n :" 'font-lock-face prefix-face) 1733 "\n :" 'font-lock-face prefix-face)
1734 "\n :") 1734 "\n :")
1735 match-str) 1735 match-str)
1736 ;; Add marker at eol, but no mouse props. 1736 ;; Add marker at eol, but no mouse props.
@@ -1777,7 +1777,7 @@ See also `multi-occur'."
1777 (setq curr-line (+ curr-line (count-lines begpt endpt) 1777 (setq curr-line (+ curr-line (count-lines begpt endpt)
1778 ;; Add 1 for empty last match line 1778 ;; Add 1 for empty last match line
1779 ;; since count-lines returns one 1779 ;; since count-lines returns one
1780 ;; line less. 1780 ;; line less.
1781 (if (and (bolp) (eolp)) 1 0))) 1781 (if (and (bolp) (eolp)) 1 0)))
1782 ;; On to the next match... 1782 ;; On to the next match...
1783 (forward-line 1)) 1783 (forward-line 1))
@@ -1820,16 +1820,16 @@ See also `multi-occur'."
1820 (if (= lines matches) 1820 (if (= lines matches)
1821 "" (format " in %d line%s" 1821 "" (format " in %d line%s"
1822 lines 1822 lines
1823 (if (= lines 1) "" "s"))) 1823 (if (= lines 1) "" "s")))
1824 ;; Don't display regexp for multi-buffer. 1824 ;; Don't display regexp for multi-buffer.
1825 (if (> (length buffers) 1) 1825 (if (> (length buffers) 1)
1826 "" (occur-regexp-descr regexp)) 1826 "" (occur-regexp-descr regexp))
1827 (buffer-name buf) 1827 (buffer-name buf)
1828 (if in-region-p 1828 (if in-region-p
1829 (format " within region: %d-%d" 1829 (format " within region: %d-%d"
1830 occur--region-start 1830 occur--region-start
1831 occur--region-end) 1831 occur--region-end)
1832 "")) 1832 ""))
1833 'read-only t)) 1833 'read-only t))
1834 (setq end (point)) 1834 (setq end (point))
1835 (add-text-properties beg end `(occur-title ,buf)) 1835 (add-text-properties beg end `(occur-title ,buf))
@@ -2220,9 +2220,9 @@ It is called with three arguments, as if it were
2220 ;; used after `recursive-edit' might override them. 2220 ;; used after `recursive-edit' might override them.
2221 (let* ((isearch-regexp regexp-flag) 2221 (let* ((isearch-regexp regexp-flag)
2222 (isearch-regexp-function (or delimited-flag 2222 (isearch-regexp-function (or delimited-flag
2223 (and replace-char-fold 2223 (and replace-char-fold
2224 (not regexp-flag) 2224 (not regexp-flag)
2225 #'char-fold-to-regexp))) 2225 #'char-fold-to-regexp)))
2226 (isearch-lax-whitespace 2226 (isearch-lax-whitespace
2227 replace-lax-whitespace) 2227 replace-lax-whitespace)
2228 (isearch-regexp-lax-whitespace 2228 (isearch-regexp-lax-whitespace