summaryrefslogtreecommitdiff
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2019-10-17 02:08:43 +0200
committerJuanma Barranquero <lekktu@gmail.com>2019-10-17 02:08:43 +0200
commit2bb0703e24ec1b02bb2ab4be67719e2e050cc4d3 (patch)
tree77a076491e0635e2728393ac79c87f925e4a935e /lisp/textmodes
parentd502f0c4b5bf0d6dbf0a125b01db21fa3b6292df (diff)
downloademacs-2bb0703e24ec1b02bb2ab4be67719e2e050cc4d3.tar.gz
emacs-2bb0703e24ec1b02bb2ab4be67719e2e050cc4d3.tar.bz2
emacs-2bb0703e24ec1b02bb2ab4be67719e2e050cc4d3.zip
lisp/*.el: Force non-nil result to t, to match docstring
* lisp/emacs-lock.el (emacs-lock-live-process-p): * lisp/shadowfile.el (shadow-file-match): * lisp/emacs-lisp/edebug.el (edebug-basic-spec): * lisp/mail/rmail.el (rmail-expunge-confirmed): * lisp/net/soap-client.el (soap-should-encode-value-for-xs-element): * lisp/progmodes/idlwave.el (idlwave-quoted): * lisp/progmodes/idlw-shell.el (idlwave-shell-filename-string): * lisp/textmodes/refbib.el (r2b-isa-proceedings): * lisp/textmodes/texnfo-upd.el (texinfo-find-lower-level-node): Normalize boolean result.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/refbib.el5
-rw-r--r--lisp/textmodes/texnfo-upd.el35
2 files changed, 21 insertions, 19 deletions
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index 3ba52e61ea6..207fcf2f213 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -498,8 +498,9 @@ try to replace the {DATA} with an abbreviation."
(assoc name r2b-proceedings-list)
(let ((match (assoc name r2b-booktitle-abbrevs)))
(and match
- (string-match "proceedings\\|conference" (car (cdr match)))))
- )))
+ (string-match "proceedings\\|conference" (car (cdr match))))))
+ t
+ ))
(defun r2b-isa-university (name)
"Return t if NAME is a university or similar organization,
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 134f82b14e0..e2a0ed9af6f 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -410,23 +410,24 @@ and to the end of the menu region for the level.
Return t if the node is found, else nil. Leave point at the beginning
of the node if one is found; else do not move point."
(let ((case-fold-search t))
- (if (and (< (point) region-end)
- (re-search-forward
- (concat
- "\\(^@node\\).*\n" ; match node line
- "\\(\\(\\(^@c\\).*\n\\)" ; match comment line, if any
- "\\|" ; or
- "\\(^@ifinfo[ ]*\n\\)" ; ifinfo line, if any
- "\\|" ; or
- "\\(^@ifnottex[ ]*\n\\)" ; ifnottex line, if any
- "\\)?" ; end of expression
- (eval (cdr (assoc level texinfo-update-menu-lower-regexps))))
- ;; the next higher level node marks the end of this
- ;; section, and no lower level node will be found beyond
- ;; this position even if region-end is farther off
- (texinfo-update-menu-region-end level)
- t))
- (goto-char (match-beginning 1)))))
+ (when (and (< (point) region-end)
+ (re-search-forward
+ (concat
+ "\\(^@node\\).*\n" ; match node line
+ "\\(\\(\\(^@c\\).*\n\\)" ; match comment line, if any
+ "\\|" ; or
+ "\\(^@ifinfo[ ]*\n\\)" ; ifinfo line, if any
+ "\\|" ; or
+ "\\(^@ifnottex[ ]*\n\\)" ; ifnottex line, if any
+ "\\)?" ; end of expression
+ (eval (cdr (assoc level texinfo-update-menu-lower-regexps))))
+ ;; the next higher level node marks the end of this
+ ;; section, and no lower level node will be found beyond
+ ;; this position even if region-end is farther off
+ (texinfo-update-menu-region-end level)
+ t))
+ (goto-char (match-beginning 1))
+ t)))
(defun texinfo-find-higher-level-node (level region-end)
"Search forward from point for node at any higher level than argument LEVEL.