X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c8d3a25c0981020e1b8aa3bf96a4a0059be82431..a0b5606ec769968b10c765f8ff50f312d691ef62:/lisp/allout.el diff --git a/lisp/allout.el b/lisp/allout.el index 7077af55e6..0896ace587 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -1,6 +1,6 @@ ;;; allout.el --- extensive outline mode for use alone and with other modes -;; Copyright (C) 1992-1994, 2001-2012 Free Software Foundation, Inc. +;; Copyright (C) 1992-1994, 2001-2013 Free Software Foundation, Inc. ;; Author: Ken Manheimer ;; Maintainer: Ken Manheimer @@ -74,14 +74,12 @@ ;;; Code: +(declare-function epa-passphrase-callback-function + "epa" (context key-id handback)) + ;;;_* Dependency loads (require 'overlay) (eval-when-compile - ;; Most of the requires here are for stuff covered by autoloads, which - ;; byte-compiling doesn't trigger. - (require 'epg) - (require 'epa) - (require 'overlay) ;; `cl' is required for `assert'. `assert' is not covered by a standard ;; autoload, but it is a macro, so that eval-when-compile is sufficient ;; to byte-compile it in, or to do the require when the buffer evalled. @@ -1415,7 +1413,7 @@ their settings before allout-mode was started." ;;;_ = allout-exposure-change-functions (define-obsolete-variable-alias 'allout-exposure-change-hook - 'allout-exposure-change-functions "24.2") + 'allout-exposure-change-functions "24.3") (defcustom allout-exposure-change-functions nil "Abnormal hook run after allout outline subtree exposure changes. It is run at the conclusion of `allout-flag-region'. @@ -1429,11 +1427,11 @@ Functions on the hook must take three arguments: This hook might be invoked multiple times by a single command." :type 'hook :group 'allout - :version "24.2") + :version "24.3") ;;;_ = allout-structure-added-functions (define-obsolete-variable-alias 'allout-structure-added-hook - 'allout-structure-added-functions "24.2") + 'allout-structure-added-functions "24.3") (defcustom allout-structure-added-functions nil "Abnormal hook run after adding items to an Allout outline. Functions on the hook should take two arguments: @@ -1444,11 +1442,11 @@ Functions on the hook should take two arguments: This hook might be invoked multiple times by a single command." :type 'hook :group 'allout - :version "24.2") + :version "24.3") ;;;_ = allout-structure-deleted-functions (define-obsolete-variable-alias 'allout-structure-deleted-hook - 'allout-structure-deleted-functions "24.2") + 'allout-structure-deleted-functions "24.3") (defcustom allout-structure-deleted-functions nil "Abnormal hook run after deleting subtrees from an Allout outline. Functions on the hook must take two arguments: @@ -1462,11 +1460,11 @@ specifically edits that native allout routines do not control. This hook might be invoked multiple times by a single command." :type 'hook :group 'allout - :version "24.2") + :version "24.3") ;;;_ = allout-structure-shifted-functions (define-obsolete-variable-alias 'allout-structure-shifted-hook - 'allout-structure-shifted-functions "24.2") + 'allout-structure-shifted-functions "24.3") (defcustom allout-structure-shifted-functions nil "Abnormal hook run after shifting items in an Allout outline. Functions on the hook should take two arguments: @@ -1480,14 +1478,14 @@ that native allout routines do not control. This hook might be invoked multiple times by a single command." :type 'hook :group 'allout - :version "24.2") + :version "24.3") ;;;_ = allout-after-copy-or-kill-hook (defcustom allout-after-copy-or-kill-hook nil "Normal hook run after copying outline text.." :type 'hook :group 'allout - :version "24.2") + :version "24.3") ;;;_ = allout-post-undo-hook (defcustom allout-post-undo-hook nil @@ -1496,7 +1494,7 @@ The item that's current when the hook is run *may* be the one that was affected by the undo.." :type 'hook :group 'allout - :version "24.2") + :version "24.3") ;;;_ = allout-outside-normal-auto-fill-function (defvar allout-outside-normal-auto-fill-function nil @@ -1522,8 +1520,8 @@ The verifier string is retained as an Emacs file variable, as well as in the Emacs buffer state, if file variable adjustments are enabled. See `allout-enable-file-variable-adjustment' for details about that.") (make-variable-buffer-local 'allout-passphrase-verifier-string) -(make-obsolete 'allout-passphrase-verifier-string - 'allout-passphrase-verifier-string "23.3") +(make-obsolete-variable 'allout-passphrase-verifier-string + 'allout-passphrase-verifier-string "23.3") ;;;###autoload (put 'allout-passphrase-verifier-string 'safe-local-variable 'stringp) ;;;_ = allout-passphrase-hint-string @@ -1538,8 +1536,8 @@ state, if file variable adjustments are enabled. See `allout-enable-file-variable-adjustment' for details about that.") (make-variable-buffer-local 'allout-passphrase-hint-string) (setq-default allout-passphrase-hint-string "") -(make-obsolete 'allout-passphrase-hint-string - 'allout-passphrase-hint-string "23.3") +(make-obsolete-variable 'allout-passphrase-hint-string + 'allout-passphrase-hint-string "23.3") ;;;###autoload (put 'allout-passphrase-hint-string 'safe-local-variable 'stringp) ;;;_ = allout-after-save-decrypt @@ -1566,7 +1564,7 @@ Each value can be a regexp or a list with a regexp followed by a substitution string. If it's just a regexp, all its matches are removed before the text is encrypted. If it's a regexp and a substitution, the substitution is used against the regexp matches, a la `replace-match'.") -(make-variable-buffer-local 'allout-encryption-text-removal-regexps) +(make-variable-buffer-local 'allout-encryption-plaintext-sanitization-regexps) ;;;_ = allout-encryption-ciphertext-rejection-regexps (defvar allout-encryption-ciphertext-rejection-regexps nil "Variable for regexps matching plaintext to remove before encryption. @@ -1657,10 +1655,9 @@ and the place for the cursor after the decryption is done." (defmacro allout-called-interactively-p () "A version of `called-interactively-p' independent of Emacs version." ;; ... to ease maintenance of allout without betraying deprecation. - (if (equal (subr-arity (symbol-function 'called-interactively-p)) - '(0 . 0)) - '(called-interactively-p) - '(called-interactively-p 'interactive))) + (if (ignore-errors (called-interactively-p 'interactive) t) + '(called-interactively-p 'interactive) + '(called-interactively-p))) ;;;_ = allout-inhibit-aberrance-doublecheck nil ;; In some exceptional moments, disparate topic depths need to be allowed ;; momentarily, eg when one topic is being yanked into another and they're @@ -1688,11 +1685,10 @@ from what it did before, for backwards compatibility. MODE is the activation mode - see `allout-auto-activation' for valid values." - + (declare (obsolete allout-auto-activation "23.3")) (custom-set-variables (list 'allout-auto-activation (format "%s" mode))) (format "%s" mode)) -(make-obsolete 'allout-init - "customize 'allout-auto-activation' instead." "23.3") + ;;;_ > allout-setup-menubar () (defun allout-setup-menubar () "Populate the current buffer's menubar with `allout-mode' stuff." @@ -2128,8 +2124,8 @@ OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be." ;;;_ > allout-overlay-insert-in-front-handler (ol after beg end ;;; &optional prelen) -(defun allout-overlay-insert-in-front-handler (ol after beg end - &optional prelen) +(defun allout-overlay-insert-in-front-handler (ol after beg _end + &optional _prelen) "Shift the overlay so stuff inserted in front of it is excluded." (if after ;; ??? Shouldn't moving the overlay should be unnecessary, if overlay @@ -2138,7 +2134,7 @@ OPEN: A TOPIC that is not CLOSED, though its OFFSPRING or BODY may be." ;;;_ > allout-overlay-interior-modification-handler (ol after beg end ;;; &optional prelen) (defun allout-overlay-interior-modification-handler (ol after beg end - &optional prelen) + &optional _prelen) "Get confirmation before making arbitrary changes to invisible text. We expose the invisible text and ask for confirmation. Refusal or @@ -2201,7 +2197,7 @@ See `allout-overlay-interior-modification-handler' for details." (allout-overlay-interior-modification-handler overlay nil beg end nil)))))) ;;;_ > allout-isearch-end-handler (&optional overlay) -(defun allout-isearch-end-handler (&optional overlay) +(defun allout-isearch-end-handler (&optional _overlay) "Reconcile allout outline exposure on arriving in hidden text after isearch. Optional OVERLAY parameter is for when this function is used by @@ -2740,7 +2736,7 @@ starting point, and PREV-DEPTH is depth of prior topic." ; and maybe not preferable. )) ;;;_ > allout-chart-siblings (&optional start end) -(defun allout-chart-siblings (&optional start end) +(defun allout-chart-siblings (&optional _start _end) "Produce a list of locations of this and succeeding sibling topics. Effectively a top-level chart of siblings. See `allout-chart-subtree' for an explanation of charts." @@ -3058,7 +3054,7 @@ Returning depth if successful, nil if not." nil)) ) ;;;_ > allout-up-current-level (arg) -(defun allout-up-current-level (arg) +(defun allout-up-current-level (_arg) "Move out ARG levels from current visible topic." (interactive "p") (let ((start-point (point))) @@ -3205,7 +3201,7 @@ Presumes point is at the start of a topic prefix." "Go back to the first sibling at this level, visible or not." (allout-end-of-level 'backward)) ;;;_ > allout-end-of-level (&optional backward) -(defun allout-end-of-level (&optional backward) +(defun allout-end-of-level (&optional _backward) "Go to the last sibling at this level, visible or not." (let ((depth (allout-depth))) @@ -3937,7 +3933,7 @@ Maintains outline hanging topic indentation if (if (or allout-former-auto-filler allout-use-hanging-indents) (funcall use-auto-fill-function))))) ;;;_ > allout-reindent-body (old-depth new-depth &optional number) -(defun allout-reindent-body (old-depth new-depth &optional number) +(defun allout-reindent-body (old-depth new-depth &optional _number) "Reindent body lines which were indented at OLD-DEPTH to NEW-DEPTH. Optional arg NUMBER indicates numbering is being added, and it must @@ -4566,7 +4562,7 @@ Topic exposure is marked with text-properties, to be used by (if next (goto-char next))))) (set-buffer-modified-p was-modified)))) ;;;_ > allout-yank-processing () -(defun allout-yank-processing (&optional arg) +(defun allout-yank-processing (&optional _arg) "Incidental allout-specific business to be done just after text yanks. @@ -5312,11 +5308,11 @@ Examples: Expose children and grandchildren of first topic at current level, and expose children of subsequent topics at current level *except* for the last, which should be opened completely." - (list 'save-excursion - '(if (not (or (allout-goto-prefix-doublechecked) - (allout-next-heading))) - (error "allout-new-exposure: Can't find any outline topics")) - (list 'allout-expose-topic (list 'quote spec)))) + `(save-excursion + (if (not (or (allout-goto-prefix-doublechecked) + (allout-next-heading))) + (error "allout-new-exposure: Can't find any outline topics")) + (allout-expose-topic ',spec))) ;;;_ #7 Systematic outline presentation -- copying, printing, flattening @@ -5349,7 +5345,7 @@ Optional arg CONTEXT indicates interior levels to include." (cons (make-string (1+ (truncate (if (zerop (car flat-index)) 1 - (log10 (car flat-index))))) + (log (car flat-index) 10)))) ? ) result))) (setq flat-index (cdr flat-index))) @@ -5389,7 +5385,7 @@ Optional arg CONTEXT indicates interior levels to include." (cons (make-string (1+ (truncate (if (zerop (car flat-index)) 1 - (log10 (car flat-index))))) + (log (car flat-index) 10)))) ? ) result))) (setq flat-index (cdr flat-index))) @@ -5528,7 +5524,7 @@ header and body. The elements of that list are: ;;_ > allout-process-exposed (&optional func from to frombuf ;;; tobuf format) (defun allout-process-exposed (&optional func from to frombuf tobuf - format start-num) + format _start-num) "Map function on exposed parts of current topic; results to another buffer. All args are options; default values itemized below. @@ -5692,7 +5688,7 @@ used verbatim." ;;;_ - LaTeX formatting ;;;_ > allout-latex-verb-quote (string &optional flow) -(defun allout-latex-verb-quote (string &optional flow) +(defun allout-latex-verb-quote (string &optional _flow) "Return copy of STRING for literal reproduction across LaTeX processing. Expresses the original characters (including carriage returns) of the string across LaTeX processing." @@ -5713,7 +5709,7 @@ across LaTeX processing, within the context of a `verbatim' environment. Leaves point at the end of the line." (let ((inhibit-field-text-motion t)) (beginning-of-line) - (let ((beg (point)) + (let (;(beg (point)) (end (point-at-eol))) (save-match-data (while (re-search-forward "\\\\" @@ -5797,7 +5793,7 @@ environment. Leaves point at the end of the line." (set-buffer buffer) (insert "\n\\end{document}\n")) ;;;_ > allout-latexify-one-item (depth prefix bullet text) -(defun allout-latexify-one-item (depth prefix bullet text) +(defun allout-latexify-one-item (depth _prefix bullet text) "Insert LaTeX commands for formatting one outline item. Args are the topics numeric DEPTH, the header PREFIX lead string, the @@ -6048,6 +6044,16 @@ See `allout-toggle-current-subtree-encryption' for more details." (run-hook-with-args 'allout-structure-added-functions bullet-pos subtree-end)))) + +(declare-function epg-context-set-passphrase-callback "epg" + (context passphrase-callback)) +(declare-function epg-list-keys "epg" (context &optional name mode)) +(declare-function epg-decrypt-string "epg" (context cipher)) +(declare-function epg-encrypt-string "epg" + (context plain recipients &optional sign always-trust)) +(declare-function epg-user-id-string "epg" (user-id)) +(declare-function epg-key-user-id-list "epg" (key)) + ;;;_ > allout-encrypt-string (text decrypt allout-buffer keymode-cue ;;; &optional rejected) (defun allout-encrypt-string (text decrypt allout-buffer keymode-cue @@ -6356,7 +6362,7 @@ save. See `allout-encrypt-unencrypted-on-saves' for more info." ;;;###autoload (defalias 'outlinify-sticky 'outlineify-sticky) ;;;###autoload -(defun outlineify-sticky (&optional arg) +(defun outlineify-sticky (&optional _arg) "Activate outline mode and establish file var so it is started subsequently. See `allout-layout' and customization of `allout-auto-activation'