(compose-string, encode-composition-rule, compose-last-chars):

[gnu-emacs] / lisp / allout.el

diff --git a/lisp/allout.el b/lisp/allout.el
index 2c02397bd1af01a215a0707a5b304958c5f43476..6f5d06cf79ed3a8d8ad99ae0887767c82f4b579e 100644 (file)
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1147,7 +1147,7 @@ Topic text constituents:
 
 HEADER:        The first line of a topic, include the topic PREFIX and header
        text.
-PREFIX: The leading text of a topic which which distinguishes it from
+PREFIX: The leading text of a topic which distinguishes it from
        normal text.  It has a strict form, which consists of a
        prefix-lead string, padding, and a bullet.  The bullet may be
        followed by a number, indicating the ordinal number of the
@@ -2218,8 +2218,7 @@ are exempt from this restriction."
                      (if rehide-place (goto-char rehide-place))
                      (allout-hide-current-entry-completely))
                  (allout-hide-current-entry))
-               (error (concat
-                       "Change within concealed region prevented.")))))))
+               (error "Change within concealed region prevented"))))))
     )  ; if
   )    ; defun
 ;;;_   = allout-post-goto-bullet
@@ -2403,7 +2402,7 @@ Returns the endpoint of the region."
       (setq allout-isearch-prior-pos nil)
     (if (not (eq mode 'final))
        (setq allout-isearch-prior-pos (cons (point) (allout-show-entry)))
-      (if isearch-mode-end-hook-error
+      (if isearch-mode-end-hook-quit
          nil
        (setq allout-isearch-prior-pos nil)
        (allout-show-children)))))
@@ -3426,9 +3425,9 @@ by pops to non-distinctive yanks.  Bug..."
   (interactive)
   (if (not allout-file-xref-bullet)
       (error
-       "outline cross references disabled - no `allout-file-xref-bullet'")
+       "Outline cross references disabled - no `allout-file-xref-bullet'")
     (if (not (string= (allout-current-bullet) allout-file-xref-bullet))
-        (error "current heading lacks cross-reference bullet `%s'"
+        (error "Current heading lacks cross-reference bullet `%s'"
                allout-file-xref-bullet)
       (let (file-name)
         (save-excursion