2013-12-20 16:21:45 +00:00
|
|
|
;;; subr-x.el --- extra Lisp functions -*- lexical-binding:t -*-
|
2013-11-04 15:34:42 +00:00
|
|
|
|
2016-01-01 09:16:19 +00:00
|
|
|
;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
|
2013-11-04 15:34:42 +00:00
|
|
|
|
2014-02-10 01:34:22 +00:00
|
|
|
;; Maintainer: emacs-devel@gnu.org
|
2013-11-04 15:34:42 +00:00
|
|
|
;; Keywords: convenience
|
|
|
|
;; Package: emacs
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2013-12-20 16:21:45 +00:00
|
|
|
;; Less commonly used functions that complement basic APIs, often implemented in
|
|
|
|
;; C code (like hash-tables and strings), and are not eligible for inclusion
|
|
|
|
;; in subr.el.
|
|
|
|
|
2014-01-20 20:05:04 +00:00
|
|
|
;; Do not document these functions in the lispref.
|
|
|
|
;; http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01006.html
|
|
|
|
|
2013-11-04 15:34:42 +00:00
|
|
|
;;; Code:
|
|
|
|
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 04:11:43 +00:00
|
|
|
(require 'pcase)
|
|
|
|
|
|
|
|
|
|
|
|
(defmacro internal--thread-argument (first? &rest forms)
|
|
|
|
"Internal implementation for `thread-first' and `thread-last'.
|
|
|
|
When Argument FIRST? is non-nil argument is threaded first, else
|
|
|
|
last. FORMS are the expressions to be threaded."
|
|
|
|
(pcase forms
|
|
|
|
(`(,x (,f . ,args) . ,rest)
|
|
|
|
`(internal--thread-argument
|
|
|
|
,first? ,(if first? `(,f ,x ,@args) `(,f ,@args ,x)) ,@rest))
|
|
|
|
(`(,x ,f . ,rest) `(internal--thread-argument ,first? (,f ,x) ,@rest))
|
|
|
|
(_ (car forms))))
|
|
|
|
|
|
|
|
(defmacro thread-first (&rest forms)
|
2014-09-11 19:44:25 +00:00
|
|
|
"Thread FORMS elements as the first argument of their successor.
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 04:11:43 +00:00
|
|
|
Example:
|
|
|
|
(thread-first
|
|
|
|
5
|
|
|
|
(+ 20)
|
|
|
|
(/ 25)
|
|
|
|
-
|
|
|
|
(+ 40))
|
|
|
|
Is equivalent to:
|
|
|
|
(+ (- (/ (+ 5 20) 25)) 40)
|
|
|
|
Note how the single `-' got converted into a list before
|
|
|
|
threading."
|
|
|
|
(declare (indent 1)
|
|
|
|
(debug (form &rest [&or symbolp (sexp &rest form)])))
|
|
|
|
`(internal--thread-argument t ,@forms))
|
|
|
|
|
|
|
|
(defmacro thread-last (&rest forms)
|
2014-09-11 19:44:25 +00:00
|
|
|
"Thread FORMS elements as the last argument of their successor.
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 04:11:43 +00:00
|
|
|
Example:
|
|
|
|
(thread-last
|
|
|
|
5
|
|
|
|
(+ 20)
|
|
|
|
(/ 25)
|
|
|
|
-
|
|
|
|
(+ 40))
|
|
|
|
Is equivalent to:
|
|
|
|
(+ 40 (- (/ 25 (+ 20 5))))
|
|
|
|
Note how the single `-' got converted into a list before
|
|
|
|
threading."
|
|
|
|
(declare (indent 1) (debug thread-first))
|
|
|
|
`(internal--thread-argument nil ,@forms))
|
|
|
|
|
|
|
|
(defsubst internal--listify (elt)
|
|
|
|
"Wrap ELT in a list if it is not one."
|
|
|
|
(if (not (listp elt))
|
|
|
|
(list elt)
|
|
|
|
elt))
|
|
|
|
|
|
|
|
(defsubst internal--check-binding (binding)
|
|
|
|
"Check BINDING is properly formed."
|
|
|
|
(when (> (length binding) 2)
|
|
|
|
(signal
|
|
|
|
'error
|
Go back to grave quoting in source-code docstrings etc.
This reverts almost all my recent changes to use curved quotes
in docstrings and/or strings used for error diagnostics.
There are a few exceptions, e.g., Bahá’í proper names.
* admin/unidata/unidata-gen.el (unidata-gen-table):
* lisp/abbrev.el (expand-region-abbrevs):
* lisp/align.el (align-region):
* lisp/allout.el (allout-mode, allout-solicit-alternate-bullet)
(outlineify-sticky):
* lisp/apropos.el (apropos-library):
* lisp/bookmark.el (bookmark-default-annotation-text):
* lisp/button.el (button-category-symbol, button-put)
(make-text-button):
* lisp/calc/calc-aent.el (math-read-if, math-read-factor):
* lisp/calc/calc-embed.el (calc-do-embedded):
* lisp/calc/calc-ext.el (calc-user-function-list):
* lisp/calc/calc-graph.el (calc-graph-show-dumb):
* lisp/calc/calc-help.el (calc-describe-key)
(calc-describe-thing, calc-full-help):
* lisp/calc/calc-lang.el (calc-c-language)
(math-parse-fortran-vector-end, math-parse-tex-sum)
(math-parse-eqn-matrix, math-parse-eqn-prime)
(calc-yacas-language, calc-maxima-language, calc-giac-language)
(math-read-giac-subscr, math-read-math-subscr)
(math-read-big-rec, math-read-big-balance):
* lisp/calc/calc-misc.el (calc-help, report-calc-bug):
* lisp/calc/calc-mode.el (calc-auto-why, calc-save-modes)
(calc-auto-recompute):
* lisp/calc/calc-prog.el (calc-fix-token-name)
(calc-read-parse-table-part, calc-user-define-invocation)
(math-do-arg-check):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-units.el (math-build-units-table-buffer):
* lisp/calc/calc-vec.el (math-read-brackets):
* lisp/calc/calc-yank.el (calc-edit-mode):
* lisp/calc/calc.el (calc, calc-do, calc-user-invocation):
* lisp/calendar/appt.el (appt-display-message):
* lisp/calendar/diary-lib.el (diary-check-diary-file)
(diary-mail-entries, diary-from-outlook):
* lisp/calendar/icalendar.el (icalendar-export-region)
(icalendar--convert-float-to-ical)
(icalendar--convert-date-to-ical)
(icalendar--convert-ical-to-diary)
(icalendar--convert-recurring-to-diary)
(icalendar--add-diary-entry):
* lisp/calendar/time-date.el (format-seconds):
* lisp/calendar/timeclock.el (timeclock-mode-line-display)
(timeclock-make-hours-explicit, timeclock-log-data):
* lisp/calendar/todo-mode.el (todo-prefix, todo-delete-category)
(todo-item-mark, todo-check-format)
(todo-insert-item--next-param, todo-edit-item--next-key)
(todo-mode):
* lisp/cedet/ede/pmake.el (ede-proj-makefile-insert-dist-rules):
* lisp/cedet/mode-local.el (describe-mode-local-overload)
(mode-local-print-binding, mode-local-describe-bindings-2):
* lisp/cedet/semantic/complete.el (semantic-displayor-show-request):
* lisp/cedet/srecode/srt-mode.el (srecode-macro-help):
* lisp/cus-start.el (standard):
* lisp/cus-theme.el (describe-theme-1):
* lisp/custom.el (custom-add-dependencies, custom-check-theme)
(custom--sort-vars-1, load-theme):
* lisp/descr-text.el (describe-text-properties-1, describe-char):
* lisp/dired-x.el (dired-do-run-mail):
* lisp/dired.el (dired-log):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-enable-advice)
(ad-disable-advice, ad-remove-advice, ad-set-argument)
(ad-set-arguments, ad--defalias-fset, ad-activate)
(ad-deactivate):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand)
(byte-compile-unfold-lambda, byte-optimize-form-code-walker)
(byte-optimize-while, byte-optimize-apply):
* lisp/emacs-lisp/byte-run.el (defun, defsubst):
* lisp/emacs-lisp/bytecomp.el (byte-compile-lapcode)
(byte-compile-log-file, byte-compile-format-warn)
(byte-compile-nogroup-warn, byte-compile-arglist-warn)
(byte-compile-cl-warn)
(byte-compile-warn-about-unresolved-functions)
(byte-compile-file, byte-compile--declare-var)
(byte-compile-file-form-defmumble, byte-compile-form)
(byte-compile-normal-call, byte-compile-check-variable)
(byte-compile-variable-ref, byte-compile-variable-set)
(byte-compile-subr-wrong-args, byte-compile-setq-default)
(byte-compile-negation-optimizer)
(byte-compile-condition-case--old)
(byte-compile-condition-case--new, byte-compile-save-excursion)
(byte-compile-defvar, byte-compile-autoload)
(byte-compile-lambda-form)
(byte-compile-make-variable-buffer-local, display-call-tree)
(batch-byte-compile):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv--analyze-use):
* lisp/emacs-lisp/chart.el (chart-space-usage):
* lisp/emacs-lisp/check-declare.el (check-declare-scan)
(check-declare-warn, check-declare-file)
(check-declare-directory):
* lisp/emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine)
(checkdoc-message-text-engine):
* lisp/emacs-lisp/cl-extra.el (cl-parse-integer)
(cl--describe-class):
* lisp/emacs-lisp/cl-generic.el (cl-defgeneric)
(cl--generic-describe, cl-generic-generalizers):
* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause, cl-tagbody)
(cl-symbol-macrolet):
* lisp/emacs-lisp/cl.el (cl-unload-function, flet):
* lisp/emacs-lisp/copyright.el (copyright)
(copyright-update-directory):
* lisp/emacs-lisp/edebug.el (edebug-read-list):
* lisp/emacs-lisp/eieio-base.el (eieio-persistent-read):
* lisp/emacs-lisp/eieio-core.el (eieio--slot-override)
(eieio-oref):
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor):
* lisp/emacs-lisp/eieio-speedbar.el:
(eieio-speedbar-child-make-tag-lines)
(eieio-speedbar-child-description):
* lisp/emacs-lisp/eieio.el (defclass, change-class):
* lisp/emacs-lisp/elint.el (elint-file, elint-get-top-forms)
(elint-init-form, elint-check-defalias-form)
(elint-check-let-form):
* lisp/emacs-lisp/ert.el (ert-get-test, ert-results-mode-menu)
(ert-results-pop-to-backtrace-for-test-at-point)
(ert-results-pop-to-messages-for-test-at-point)
(ert-results-pop-to-should-forms-for-test-at-point)
(ert-describe-test):
* lisp/emacs-lisp/find-func.el (find-function-search-for-symbol)
(find-function-library):
* lisp/emacs-lisp/generator.el (iter-yield):
* lisp/emacs-lisp/gv.el (gv-define-simple-setter):
* lisp/emacs-lisp/lisp-mnt.el (lm-verify):
* lisp/emacs-lisp/macroexp.el (macroexp--obsolete-warning):
* lisp/emacs-lisp/map-ynp.el (map-y-or-n-p):
* lisp/emacs-lisp/nadvice.el (advice--make-docstring)
(advice--make, define-advice):
* lisp/emacs-lisp/package-x.el (package-upload-file):
* lisp/emacs-lisp/package.el (package-version-join)
(package-disabled-p, package-activate-1, package-activate)
(package--download-one-archive)
(package--download-and-read-archives)
(package-compute-transaction, package-install-from-archive)
(package-install, package-install-selected-packages)
(package-delete, package-autoremove, describe-package-1)
(package-install-button-action, package-delete-button-action)
(package-menu-hide-package, package-menu--list-to-prompt)
(package-menu--perform-transaction)
(package-menu--find-and-notify-upgrades):
* lisp/emacs-lisp/pcase.el (pcase-exhaustive, pcase--u1):
* lisp/emacs-lisp/re-builder.el (reb-enter-subexp-mode):
* lisp/emacs-lisp/ring.el (ring-previous, ring-next):
* lisp/emacs-lisp/rx.el (rx-check, rx-anything)
(rx-check-any-string, rx-check-any, rx-check-not, rx-=)
(rx-repeat, rx-check-backref, rx-syntax, rx-check-category)
(rx-form):
* lisp/emacs-lisp/smie.el (smie-config-save):
* lisp/emacs-lisp/subr-x.el (internal--check-binding):
* lisp/emacs-lisp/tabulated-list.el (tabulated-list-put-tag):
* lisp/emacs-lisp/testcover.el (testcover-1value):
* lisp/emacs-lisp/timer.el (timer-event-handler):
* lisp/emulation/viper-cmd.el (viper-toggle-parse-sexp-ignore-comments)
(viper-toggle-search-style, viper-kill-buffer)
(viper-brac-function):
* lisp/emulation/viper-macs.el (viper-record-kbd-macro):
* lisp/env.el (setenv):
* lisp/erc/erc-button.el (erc-nick-popup):
* lisp/erc/erc.el (erc-cmd-LOAD, erc-handle-login, english):
* lisp/eshell/em-dirs.el (eshell/cd):
* lisp/eshell/em-glob.el (eshell-glob-regexp)
(eshell-glob-entries):
* lisp/eshell/em-pred.el (eshell-parse-modifiers):
* lisp/eshell/esh-opt.el (eshell-show-usage):
* lisp/facemenu.el (facemenu-add-new-face)
(facemenu-add-new-color):
* lisp/faces.el (read-face-name, read-face-font, describe-face)
(x-resolve-font-name):
* lisp/files-x.el (modify-file-local-variable):
* lisp/files.el (locate-user-emacs-file, find-alternate-file)
(set-auto-mode, hack-one-local-variable--obsolete)
(dir-locals-set-directory-class, write-file, basic-save-buffer)
(delete-directory, copy-directory, recover-session)
(recover-session-finish, insert-directory)
(file-modes-char-to-who, file-modes-symbolic-to-number)
(move-file-to-trash):
* lisp/filesets.el (filesets-add-buffer, filesets-remove-buffer):
* lisp/find-cmd.el (find-generic, find-to-string):
* lisp/finder.el (finder-commentary):
* lisp/font-lock.el (font-lock-fontify-buffer):
* lisp/format.el (format-write-file, format-find-file)
(format-insert-file):
* lisp/frame.el (get-device-terminal, select-frame-by-name):
* lisp/fringe.el (fringe--check-style):
* lisp/gnus/nnmairix.el (nnmairix-widget-create-query):
* lisp/help-fns.el (help-fns--key-bindings)
(help-fns--compiler-macro, help-fns--parent-mode)
(help-fns--obsolete, help-fns--interactive-only)
(describe-function-1, describe-variable):
* lisp/help.el (describe-mode)
(describe-minor-mode-from-indicator):
* lisp/image.el (image-type):
* lisp/international/ccl.el (ccl-dump):
* lisp/international/fontset.el (x-must-resolve-font-name):
* lisp/international/mule-cmds.el (prefer-coding-system)
(select-safe-coding-system-interactively)
(select-safe-coding-system, activate-input-method)
(toggle-input-method, describe-current-input-method)
(describe-language-environment):
* lisp/international/mule-conf.el (code-offset):
* lisp/international/mule-diag.el (describe-character-set)
(list-input-methods-1):
* lisp/mail/feedmail.el (feedmail-run-the-queue):
* lisp/mouse.el (minor-mode-menu-from-indicator):
* lisp/mpc.el (mpc-playlist-rename):
* lisp/msb.el (msb--choose-menu):
* lisp/net/ange-ftp.el (ange-ftp-shell-command):
* lisp/net/imap.el (imap-interactive-login):
* lisp/net/mairix.el (mairix-widget-create-query):
* lisp/net/newst-backend.el (newsticker--sentinel-work):
* lisp/net/newst-treeview.el (newsticker--treeview-load):
* lisp/net/rlogin.el (rlogin):
* lisp/obsolete/iswitchb.el (iswitchb-possible-new-buffer):
* lisp/obsolete/otodo-mode.el (todo-more-important-p):
* lisp/obsolete/pgg-gpg.el (pgg-gpg-process-region):
* lisp/obsolete/pgg-pgp.el (pgg-pgp-process-region):
* lisp/obsolete/pgg-pgp5.el (pgg-pgp5-process-region):
* lisp/org/ob-core.el (org-babel-goto-named-src-block)
(org-babel-goto-named-result):
* lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap):
* lisp/org/ob-ref.el (org-babel-ref-resolve):
* lisp/org/org-agenda.el (org-agenda-prepare):
* lisp/org/org-clock.el (org-clock-notify-once-if-expired)
(org-clock-resolve):
* lisp/org/org-ctags.el (org-ctags-ask-rebuild-tags-file-then-find-tag):
* lisp/org/org-feed.el (org-feed-parse-atom-entry):
* lisp/org/org-habit.el (org-habit-parse-todo):
* lisp/org/org-mouse.el (org-mouse-popup-global-menu)
(org-mouse-context-menu):
* lisp/org/org-table.el (org-table-edit-formulas):
* lisp/org/ox.el (org-export-async-start):
* lisp/proced.el (proced-log):
* lisp/progmodes/ada-mode.el (ada-get-indent-case)
(ada-check-matching-start, ada-goto-matching-start):
* lisp/progmodes/ada-prj.el (ada-prj-display-page):
* lisp/progmodes/ada-xref.el (ada-find-executable):
* lisp/progmodes/ebrowse.el (ebrowse-tags-apropos):
* lisp/progmodes/etags.el (etags-tags-apropos-additional):
* lisp/progmodes/flymake.el (flymake-parse-err-lines)
(flymake-start-syntax-check-process):
* lisp/progmodes/python.el (python-shell-get-process-or-error)
(python-define-auxiliary-skeleton):
* lisp/progmodes/sql.el (sql-comint):
* lisp/progmodes/verilog-mode.el (verilog-load-file-at-point):
* lisp/progmodes/vhdl-mode.el (vhdl-widget-directory-validate):
* lisp/recentf.el (recentf-open-files):
* lisp/replace.el (query-replace-read-from)
(occur-after-change-function, occur-1):
* lisp/scroll-bar.el (scroll-bar-columns):
* lisp/server.el (server-get-auth-key):
* lisp/simple.el (execute-extended-command)
(undo-outer-limit-truncate, list-processes--refresh)
(compose-mail, set-variable, choose-completion-string)
(define-alternatives):
* lisp/startup.el (site-run-file, tty-handle-args, command-line)
(command-line-1):
* lisp/subr.el (noreturn, define-error, add-to-list)
(read-char-choice, version-to-list):
* lisp/term/common-win.el (x-handle-xrm-switch)
(x-handle-name-switch, x-handle-args):
* lisp/term/x-win.el (x-handle-parent-id, x-handle-smid):
* lisp/textmodes/reftex-ref.el (reftex-label):
* lisp/textmodes/reftex-toc.el (reftex-toc-rename-label):
* lisp/textmodes/two-column.el (2C-split):
* lisp/tutorial.el (tutorial--describe-nonstandard-key)
(tutorial--find-changed-keys):
* lisp/type-break.el (type-break-noninteractive-query):
* lisp/wdired.el (wdired-do-renames, wdired-do-symlink-changes)
(wdired-do-perm-changes):
* lisp/whitespace.el (whitespace-report-region):
Prefer grave quoting in source-code strings used to generate help
and diagnostics.
* lisp/faces.el (face-documentation):
No need to convert quotes, since the result is a docstring.
* lisp/info.el (Info-virtual-index-find-node)
(Info-virtual-index, info-apropos):
Simplify by generating only curved quotes, since info files are
typically that ways nowadays anyway.
* lisp/international/mule-diag.el (list-input-methods):
Don’t assume text quoting style is curved.
* lisp/org/org-bibtex.el (org-bibtex-fields):
Revert my recent changes, going back to the old quoting style.
2015-09-07 15:41:44 +00:00
|
|
|
(cons "`let' bindings can have only one value-form" binding)))
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 04:11:43 +00:00
|
|
|
binding)
|
|
|
|
|
|
|
|
(defsubst internal--build-binding-value-form (binding prev-var)
|
|
|
|
"Build the conditional value form for BINDING using PREV-VAR."
|
|
|
|
`(,(car binding) (and ,prev-var ,(cadr binding))))
|
|
|
|
|
|
|
|
(defun internal--build-binding (binding prev-var)
|
|
|
|
"Check and build a single BINDING with PREV-VAR."
|
|
|
|
(thread-first
|
|
|
|
binding
|
|
|
|
internal--listify
|
|
|
|
internal--check-binding
|
|
|
|
(internal--build-binding-value-form prev-var)))
|
|
|
|
|
|
|
|
(defun internal--build-bindings (bindings)
|
|
|
|
"Check and build conditional value forms for BINDINGS."
|
|
|
|
(let ((prev-var t))
|
|
|
|
(mapcar (lambda (binding)
|
|
|
|
(let ((binding (internal--build-binding binding prev-var)))
|
|
|
|
(setq prev-var (car binding))
|
|
|
|
binding))
|
|
|
|
bindings)))
|
|
|
|
|
|
|
|
(defmacro if-let (bindings then &rest else)
|
|
|
|
"Process BINDINGS and if all values are non-nil eval THEN, else ELSE.
|
|
|
|
Argument BINDINGS is a list of tuples whose car is a symbol to be
|
|
|
|
bound and (optionally) used in THEN, and its cadr is a sexp to be
|
2014-09-11 19:44:25 +00:00
|
|
|
evalled to set symbol's value. In the special case you only want
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 04:11:43 +00:00
|
|
|
to bind a single value, BINDINGS can just be a plain tuple."
|
2015-05-07 20:13:29 +00:00
|
|
|
(declare (indent 2)
|
|
|
|
(debug ([&or (&rest (symbolp form)) (symbolp form)] form body)))
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 04:11:43 +00:00
|
|
|
(when (and (<= (length bindings) 2)
|
|
|
|
(not (listp (car bindings))))
|
|
|
|
;; Adjust the single binding case
|
|
|
|
(setq bindings (list bindings)))
|
|
|
|
`(let* ,(internal--build-bindings bindings)
|
|
|
|
(if ,(car (internal--listify (car (last bindings))))
|
|
|
|
,then
|
|
|
|
,@else)))
|
|
|
|
|
|
|
|
(defmacro when-let (bindings &rest body)
|
|
|
|
"Process BINDINGS and if all values are non-nil eval BODY.
|
|
|
|
Argument BINDINGS is a list of tuples whose car is a symbol to be
|
|
|
|
bound and (optionally) used in BODY, and its cadr is a sexp to be
|
2014-09-11 19:44:25 +00:00
|
|
|
evalled to set symbol's value. In the special case you only want
|
New if-let, when-let, thread-first and thread-last macros.
* lisp/emacs-lisp/subr-x.el
(internal--listify, internal--check-binding)
(internal--build-binding-value-form, internal--build-binding)
(internal--build-bindings): New functions.
(internal--thread-argument, thread-first, thread-last)
(if-let, when-let): New macros.
* test/automated/subr-x-tests.el
(subr-x-test-if-let-single-binding-expansion)
(subr-x-test-if-let-single-symbol-expansion)
(subr-x-test-if-let-nil-related-expansion)
(subr-x-test-if-let-malformed-binding, subr-x-test-if-let-true)
(subr-x-test-if-let-false, subr-x-test-if-let-bound-references)
(subr-x-test-if-let-and-lazyness-is-preserved)
(subr-x-test-when-let-body-expansion)
(subr-x-test-when-let-single-binding-expansion)
(subr-x-test-when-let-single-symbol-expansion)
(subr-x-test-when-let-nil-related-expansion)
(subr-x-test-when-let-malformed-binding)
(subr-x-test-when-let-true, subr-x-test-when-let-false)
(subr-x-test-when-let-bound-references)
(subr-x-test-when-let-and-lazyness-is-preserved)
(subr-x-test-thread-first-no-forms)
(subr-x-test-thread-first-function-names-are-threaded)
(subr-x-test-thread-first-expansion)
(subr-x-test-thread-last-no-forms)
(subr-x-test-thread-last-function-names-are-threaded)
(subr-x-test-thread-last-expansion): New tests.
2014-06-30 04:11:43 +00:00
|
|
|
to bind a single value, BINDINGS can just be a plain tuple."
|
|
|
|
(declare (indent 1) (debug if-let))
|
|
|
|
(list 'if-let bindings (macroexp-progn body)))
|
|
|
|
|
2015-05-20 15:50:38 +00:00
|
|
|
(defsubst hash-table-empty-p (hash-table)
|
|
|
|
"Check whether HASH-TABLE is empty (has 0 elements)."
|
|
|
|
(zerop (hash-table-count hash-table)))
|
2015-05-20 15:49:20 +00:00
|
|
|
|
2013-11-04 15:34:42 +00:00
|
|
|
(defsubst hash-table-keys (hash-table)
|
|
|
|
"Return a list of keys in HASH-TABLE."
|
|
|
|
(let ((keys '()))
|
2013-11-04 19:25:09 +00:00
|
|
|
(maphash (lambda (k _v) (push k keys)) hash-table)
|
2013-11-04 15:34:42 +00:00
|
|
|
keys))
|
|
|
|
|
|
|
|
(defsubst hash-table-values (hash-table)
|
|
|
|
"Return a list of values in HASH-TABLE."
|
|
|
|
(let ((values '()))
|
2013-11-04 19:25:09 +00:00
|
|
|
(maphash (lambda (_k v) (push v values)) hash-table)
|
2013-11-04 15:34:42 +00:00
|
|
|
values))
|
|
|
|
|
2013-11-29 16:51:44 +00:00
|
|
|
(defsubst string-empty-p (string)
|
|
|
|
"Check whether STRING is empty."
|
|
|
|
(string= string ""))
|
|
|
|
|
2013-11-25 19:04:50 +00:00
|
|
|
(defsubst string-join (strings &optional separator)
|
|
|
|
"Join all STRINGS using SEPARATOR."
|
|
|
|
(mapconcat 'identity strings separator))
|
|
|
|
|
2014-09-29 18:14:08 +00:00
|
|
|
(define-obsolete-function-alias 'string-reverse 'reverse "25.1")
|
2013-11-26 15:24:10 +00:00
|
|
|
|
2013-11-24 09:31:51 +00:00
|
|
|
(defsubst string-trim-left (string)
|
|
|
|
"Remove leading whitespace from STRING."
|
|
|
|
(if (string-match "\\`[ \t\n\r]+" string)
|
|
|
|
(replace-match "" t t string)
|
|
|
|
string))
|
|
|
|
|
|
|
|
(defsubst string-trim-right (string)
|
|
|
|
"Remove trailing whitespace from STRING."
|
|
|
|
(if (string-match "[ \t\n\r]+\\'" string)
|
|
|
|
(replace-match "" t t string)
|
|
|
|
string))
|
|
|
|
|
|
|
|
(defsubst string-trim (string)
|
|
|
|
"Remove leading and trailing whitespace from STRING."
|
|
|
|
(string-trim-left (string-trim-right string)))
|
|
|
|
|
2013-11-29 16:51:44 +00:00
|
|
|
(defsubst string-blank-p (string)
|
|
|
|
"Check whether STRING is either empty or only whitespace."
|
2013-12-07 18:46:03 +00:00
|
|
|
(string-match-p "\\`[ \t\n\r]*\\'" string))
|
2013-11-29 16:51:44 +00:00
|
|
|
|
2013-12-20 16:37:10 +00:00
|
|
|
(defsubst string-remove-prefix (prefix string)
|
|
|
|
"Remove PREFIX from STRING if present."
|
|
|
|
(if (string-prefix-p prefix string)
|
|
|
|
(substring string (length prefix))
|
|
|
|
string))
|
|
|
|
|
|
|
|
(defsubst string-remove-suffix (suffix string)
|
|
|
|
"Remove SUFFIX from STRING if present."
|
|
|
|
(if (string-suffix-p suffix string)
|
|
|
|
(substring string 0 (- (length string) (length suffix)))
|
|
|
|
string))
|
|
|
|
|
2016-07-22 09:08:13 +00:00
|
|
|
(defun read-multiple-choice (prompt choices)
|
|
|
|
"Ask user a multiple choice question.
|
|
|
|
PROMPT should be a string that will be displayed as the prompt.
|
|
|
|
|
|
|
|
CHOICES is an alist where the first element in each entry is a
|
|
|
|
character to be entered, the second element is a short name for
|
|
|
|
the entry to be displayed while prompting (if there's room, it
|
|
|
|
might be shortened), and the third, optional entry is a longer
|
|
|
|
explanation that will be displayed in a help buffer if the user
|
|
|
|
requests more help.
|
|
|
|
|
|
|
|
This function translates user input into responses by consulting
|
|
|
|
the bindings in `query-replace-map'; see the documentation of
|
|
|
|
that variable for more information. In this case, the useful
|
|
|
|
bindings are `recenter', `scroll-up', and `scroll-down'. If the
|
|
|
|
user enters `recenter', `scroll-up', or `scroll-down' responses,
|
|
|
|
perform the requested window recentering or scrolling and ask
|
|
|
|
again.
|
|
|
|
|
|
|
|
The return value is the matching entry from the CHOICES list.
|
|
|
|
|
|
|
|
Usage example:
|
|
|
|
|
|
|
|
\(read-multiple-choice \"Continue connecting?\"
|
|
|
|
'((?a \"always\")
|
|
|
|
(?s \"session only\")
|
|
|
|
(?n \"no\")))"
|
|
|
|
(let* ((altered-names nil)
|
|
|
|
(full-prompt
|
|
|
|
(format
|
|
|
|
"%s (%s): "
|
|
|
|
prompt
|
|
|
|
(mapconcat
|
|
|
|
(lambda (elem)
|
|
|
|
(let* ((name (cadr elem))
|
|
|
|
(pos (seq-position name (car elem)))
|
|
|
|
(altered-name
|
|
|
|
(cond
|
|
|
|
;; Not in the name string.
|
|
|
|
((not pos)
|
|
|
|
(format "[%c] %s" (car elem) name))
|
|
|
|
;; The prompt character is in the name, so highlight
|
|
|
|
;; it on graphical terminals...
|
|
|
|
((display-supports-face-attributes-p
|
|
|
|
'(:underline t) (window-frame))
|
|
|
|
(setq name (copy-sequence name))
|
|
|
|
(put-text-property pos (1+ pos)
|
|
|
|
'face 'read-multiple-choice-face
|
|
|
|
name)
|
|
|
|
name)
|
|
|
|
;; And put it in [bracket] on non-graphical terminals.
|
|
|
|
(t
|
|
|
|
(concat
|
|
|
|
(substring name 0 pos)
|
|
|
|
"["
|
|
|
|
(upcase (substring name pos (1+ pos)))
|
|
|
|
"]"
|
|
|
|
(substring name (1+ pos)))))))
|
|
|
|
(push (cons (car elem) altered-name)
|
|
|
|
altered-names)
|
|
|
|
altered-name))
|
|
|
|
(append choices '((?? "?")))
|
|
|
|
", ")))
|
|
|
|
tchar buf wrong-char answer)
|
|
|
|
(save-window-excursion
|
|
|
|
(save-excursion
|
|
|
|
(while (not tchar)
|
|
|
|
(message "%s%s"
|
|
|
|
(if wrong-char
|
|
|
|
"Invalid choice. "
|
|
|
|
"")
|
|
|
|
full-prompt)
|
|
|
|
(setq tchar
|
|
|
|
(if (and (display-popup-menus-p)
|
|
|
|
last-input-event ; not during startup
|
|
|
|
(listp last-nonmenu-event)
|
|
|
|
use-dialog-box)
|
|
|
|
(x-popup-dialog
|
|
|
|
t
|
|
|
|
(cons prompt
|
|
|
|
(mapcar
|
|
|
|
(lambda (elem)
|
|
|
|
(cons (capitalize (cadr elem))
|
|
|
|
(car elem)))
|
|
|
|
choices)))
|
|
|
|
(condition-case nil
|
|
|
|
(let ((cursor-in-echo-area t))
|
|
|
|
(read-char))
|
|
|
|
(error nil))))
|
|
|
|
(setq answer (lookup-key query-replace-map (vector tchar) t))
|
|
|
|
(setq tchar
|
|
|
|
(cond
|
|
|
|
((eq answer 'recenter)
|
|
|
|
(recenter) t)
|
|
|
|
((eq answer 'scroll-up)
|
|
|
|
(ignore-errors (scroll-up-command)) t)
|
|
|
|
((eq answer 'scroll-down)
|
|
|
|
(ignore-errors (scroll-down-command)) t)
|
|
|
|
((eq answer 'scroll-other-window)
|
|
|
|
(ignore-errors (scroll-other-window)) t)
|
|
|
|
((eq answer 'scroll-other-window-down)
|
|
|
|
(ignore-errors (scroll-other-window-down)) t)
|
|
|
|
(t tchar)))
|
|
|
|
(when (eq tchar t)
|
|
|
|
(setq wrong-char nil
|
|
|
|
tchar nil))
|
|
|
|
;; The user has entered an invalid choice, so display the
|
|
|
|
;; help messages.
|
|
|
|
(when (and (not (eq tchar nil))
|
|
|
|
(not (assq tchar choices)))
|
|
|
|
(setq wrong-char (not (memq tchar '(?? ?\C-h)))
|
|
|
|
tchar nil)
|
|
|
|
(when wrong-char
|
|
|
|
(ding))
|
|
|
|
(with-help-window (setq buf (get-buffer-create
|
|
|
|
"*Multiple Choice Help*"))
|
|
|
|
(with-current-buffer buf
|
|
|
|
(erase-buffer)
|
|
|
|
(pop-to-buffer buf)
|
|
|
|
(insert prompt "\n\n")
|
|
|
|
(let* ((columns (/ (window-width) 25))
|
|
|
|
(fill-column 21)
|
|
|
|
(times 0)
|
|
|
|
(start (point)))
|
|
|
|
(dolist (elem choices)
|
|
|
|
(goto-char start)
|
|
|
|
(unless (zerop times)
|
|
|
|
(if (zerop (mod times columns))
|
|
|
|
;; Go to the next "line".
|
|
|
|
(goto-char (setq start (point-max)))
|
|
|
|
;; Add padding.
|
|
|
|
(while (not (eobp))
|
|
|
|
(end-of-line)
|
|
|
|
(insert (make-string (max (- (* (mod times columns)
|
|
|
|
(+ fill-column 4))
|
|
|
|
(current-column))
|
|
|
|
0)
|
|
|
|
?\s))
|
|
|
|
(forward-line 1))))
|
|
|
|
(setq times (1+ times))
|
|
|
|
(let ((text
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert (format
|
|
|
|
"%c: %s\n"
|
|
|
|
(car elem)
|
|
|
|
(cdr (assq (car elem) altered-names))))
|
|
|
|
(fill-region (point-min) (point-max))
|
|
|
|
(when (nth 2 elem)
|
|
|
|
(let ((start (point)))
|
|
|
|
(insert (nth 2 elem))
|
|
|
|
(unless (bolp)
|
|
|
|
(insert "\n"))
|
|
|
|
(fill-region start (point-max))))
|
|
|
|
(buffer-string))))
|
|
|
|
(goto-char start)
|
|
|
|
(dolist (line (split-string text "\n"))
|
|
|
|
(end-of-line)
|
|
|
|
(if (bolp)
|
|
|
|
(insert line "\n")
|
|
|
|
(insert line))
|
|
|
|
(forward-line 1)))))))))))
|
|
|
|
(when (buffer-live-p buf)
|
|
|
|
(kill-buffer buf))
|
|
|
|
(assq tchar choices)))
|
|
|
|
|
2013-12-20 16:21:45 +00:00
|
|
|
(provide 'subr-x)
|
2013-11-04 15:34:42 +00:00
|
|
|
|
2013-12-20 16:21:45 +00:00
|
|
|
;;; subr-x.el ends here
|