emacs/lisp/cedet/ede/autoconf-edit.el
Juanma Barranquero 1143232265 lisp/*.el: Fix typos and other trivial doc fixes
* lisp/allout-widgets.el (allout-widgets-auto-activation)
(allout-current-decorated-p):
* lisp/auth-source.el (auth-source-protocols):
* lisp/autorevert.el (auto-revert-set-timer):
* lisp/battery.el (battery-mode-line-limit):
* lisp/calc/calcalg3.el (math-map-binop):
* lisp/calendar/cal-dst.el (calendar-dst-find-startend):
* lisp/calendar/cal-mayan.el (calendar-mayan-long-count-to-absolute):
* lisp/calendar/calendar.el (calendar-date-echo-text)
(calendar-generate-month, calendar-string-spread)
(calendar-cursor-to-date, calendar-read, calendar-read-date)
(calendar-mark-visible-date, calendar-dayname-on-or-before):
* lisp/calendar/diary-lib.el (diary-ordinal-suffix):
* lisp/cedet/ede/autoconf-edit.el (autoconf-new-program)
(autoconf-find-last-macro, autoconf-parameter-strip):
* lisp/cedet/ede/config.el (ede-target-with-config-build):
* lisp/cedet/ede/linux.el (ede-linux--detect-architecture)
(ede-linux--get-architecture):
* lisp/cedet/semantic/complete.el (semantic-collector-calculate-cache)
(semantic-displayer-abstract, semantic-displayer-point-position):
* lisp/cedet/semantic/format.el (semantic-format-face-alist)
(semantic-format-tag-short-doc):
* lisp/cedet/semantic/fw.el (semantic-find-file-noselect):
* lisp/cedet/semantic/idle.el (semantic-idle-scheduler-work-idle-time)
(semantic-idle-breadcrumbs-display-function)
(semantic-idle-breadcrumbs-format-tag-list-function):
* lisp/cedet/semantic/lex.el (semantic-lex-map-types)
(define-lex, define-lex-block-type-analyzer):
* lisp/cedet/semantic/senator.el (senator-search-default-tag-filter):
* lisp/cedet/semantic/symref.el (semantic-symref-result)
(semantic-symref-hit-to-tag-via-db):
* lisp/cedet/semantic/symref.el (semantic-symref-tool-baseclass):
* lisp/cedet/semantic/tag.el (semantic-tag-new-variable)
(semantic-tag-new-include, semantic-tag-new-package)
(semantic-tag-set-faux, semantic-create-tag-proxy)
(semantic-tag-function-parent)
(semantic-tag-components-with-overlays):
* lisp/cedet/srecode/cpp.el (srecode-cpp-namespaces)
(srecode-semantic-handle-:c, srecode-semantic-apply-tag-to-dict):
* lisp/cedet/srecode/dictionary.el (srecode-create-dictionary)
(srecode-dictionary-add-entries, srecode-dictionary-lookup-name)
(srecode-create-dictionaries-from-tags):
* lisp/cmuscheme.el (scheme-compile-region):
* lisp/color.el (color-lab-to-lch):
* lisp/doc-view.el (doc-view-image-width)
(doc-view-set-up-single-converter):
* lisp/dynamic-setting.el (font-setting-change-default-font)
(dynamic-setting-handle-config-changed-event):
* lisp/elec-pair.el (electric-pair-text-pairs)
(electric-pair-skip-whitespace-function)
(electric-pair-string-bound-function):
* lisp/emacs-lisp/avl-tree.el (avl-tree--del-balance)
(avl-tree-member, avl-tree-mapcar, avl-tree-iter):
* lisp/emacs-lisp/bytecomp.el (byte-compile-generate-call-tree):
* lisp/emacs-lisp/checkdoc.el (checkdoc-autofix-flag)
(checkdoc-spellcheck-documentation-flag, checkdoc-ispell)
(checkdoc-ispell-current-buffer, checkdoc-ispell-interactive)
(checkdoc-ispell-message-interactive)
(checkdoc-ispell-message-text, checkdoc-ispell-start)
(checkdoc-ispell-continue, checkdoc-ispell-comments)
(checkdoc-ispell-defun):
* lisp/emacs-lisp/cl-generic.el (cl--generic-search-method):
* lisp/emacs-lisp/eieio-custom.el (eieio-read-customization-group):
* lisp/emacs-lisp/lisp.el (forward-sexp, up-list):
* lisp/emacs-lisp/package-x.el (package--archive-contents-from-file):
* lisp/emacs-lisp/package.el (package-desc)
(package--make-autoloads-and-stuff, package-hidden-regexps):
* lisp/emacs-lisp/tcover-ses.el (ses-exercise-startup):
* lisp/emacs-lisp/testcover.el (testcover-nohits)
(testcover-1value):
* lisp/epg.el (epg-receive-keys, epg-start-edit-key):
* lisp/erc/erc-backend.el (erc-server-processing-p)
(erc-split-line-length, erc-server-coding-system)
(erc-server-send, erc-message):
* lisp/erc/erc-button.el (erc-button-face, erc-button-alist)
(erc-browse-emacswiki):
* lisp/erc/erc-ezbounce.el (erc-ezbounce, erc-ezb-get-login):
* lisp/erc/erc-fill.el (erc-fill-variable-maximum-indentation):
* lisp/erc/erc-log.el (erc-current-logfile):
* lisp/erc/erc-match.el (erc-log-match-format)
(erc-text-matched-hook):
* lisp/erc/erc-netsplit.el (erc-netsplit, erc-netsplit-debug):
* lisp/erc/erc-networks.el (erc-server-alist)
(erc-networks-alist, erc-current-network):
* lisp/erc/erc-ring.el (erc-input-ring-index):
* lisp/erc/erc-speedbar.el (erc-speedbar)
(erc-speedbar-update-channel):
* lisp/erc/erc-stamp.el (erc-timestamp-only-if-changed-flag):
* lisp/erc/erc-track.el (erc-track-position-in-mode-line)
(erc-track-remove-from-mode-line, erc-modified-channels-update)
(erc-track-last-non-erc-buffer, erc-track-sort-by-importance)
(erc-track-get-active-buffer):
* lisp/erc/erc.el (erc-get-channel-user-list)
(erc-echo-notice-hook, erc-echo-notice-always-hook)
(erc-wash-quit-reason, erc-format-@nick):
* lisp/ffap.el (ffap-latex-mode):
* lisp/files.el (abort-if-file-too-large)
(dir-locals--get-sort-score, buffer-stale--default-function):
* lisp/filesets.el (filesets-tree-max-level, filesets-data)
(filesets-update-pre010505):
* lisp/gnus/gnus-agent.el (gnus-agent-flush-cache):
* lisp/gnus/gnus-art.el (gnus-article-encrypt-protocol)
(gnus-button-prefer-mid-or-mail):
* lisp/gnus/gnus-cus.el (gnus-group-parameters):
* lisp/gnus/gnus-demon.el (gnus-demon-handlers)
(gnus-demon-run-callback):
* lisp/gnus/gnus-dired.el (gnus-dired-print):
* lisp/gnus/gnus-icalendar.el (gnus-icalendar-event-from-buffer):
* lisp/gnus/gnus-range.el (gnus-range-normalize):
* lisp/gnus/gnus-spec.el (gnus-pad-form):
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-cloud)
(gnus-server-opened, gnus-server-closed, gnus-server-denied)
(gnus-server-offline):
* lisp/gnus/gnus-sum.el (gnus-refer-thread-use-nnir)
(gnus-refer-thread-limit-to-thread)
(gnus-summary-limit-include-thread, gnus-summary-refer-thread)
(gnus-summary-find-matching):
* lisp/gnus/gnus-util.el (gnus-rescale-image):
* lisp/gnus/gnus.el (gnus-summary-line-format, gnus-no-server):
* lisp/gnus/mail-source.el (mail-source-incoming-file-prefix):
* lisp/gnus/message.el (message-cite-reply-position)
(message-cite-style-outlook, message-cite-style-thunderbird)
(message-cite-style-gmail, message--send-mail-maybe-partially):
* lisp/gnus/mm-extern.el (mm-inline-external-body):
* lisp/gnus/mm-partial.el (mm-inline-partial):
* lisp/gnus/mml-sec.el (mml-secure-message-sign)
(mml-secure-message-sign-encrypt, mml-secure-message-encrypt):
* lisp/gnus/mml2015.el (mml2015-epg-key-image)
(mml2015-epg-key-image-to-string):
* lisp/gnus/nndiary.el (nndiary-reminders, nndiary-get-new-mail):
* lisp/gnus/nnheader.el (nnheader-directory-files-is-safe):
* lisp/gnus/nnir.el (nnir-search-history)
(nnir-imap-search-other, nnir-artlist-length)
(nnir-artlist-article, nnir-artitem-group, nnir-artitem-number)
(nnir-artitem-rsv, nnir-article-group, nnir-article-number)
(nnir-article-rsv, nnir-article-ids, nnir-categorize)
(nnir-retrieve-headers-override-function)
(nnir-imap-default-search-key, nnir-hyrex-additional-switches)
(gnus-group-make-nnir-group, nnir-run-namazu, nnir-read-parms)
(nnir-read-parm, nnir-read-server-parm, nnir-search-thread):
* lisp/gnus/nnmairix.el (nnmairix-default-group)
(nnmairix-propagate-marks):
* lisp/gnus/smime.el (smime-keys, smime-crl-check)
(smime-verify-buffer, smime-noverify-buffer):
* lisp/gnus/spam-report.el (spam-report-url-ping-mm-url):
* lisp/gnus/spam.el (spam-spamassassin-positive-spam-flag-header)
(spam-spamassassin-spam-status-header, spam-sa-learn-rebuild)
(spam-classifications, spam-check-stat, spam-spamassassin-score):
* lisp/help.el (describe-minor-mode-from-symbol):
* lisp/hippie-exp.el (hippie-expand-ignore-buffers):
* lisp/htmlfontify.el (hfy-optimizations, hfy-face-resolve-face)
(hfy-begin-span):
* lisp/ibuf-ext.el (ibuffer-update-saved-filters-format)
(ibuffer-saved-filters, ibuffer-old-saved-filters-warning)
(ibuffer-filtering-qualifiers, ibuffer-repair-saved-filters)
(eval, ibuffer-unary-operand, file-extension, directory):
* lisp/image-dired.el (image-dired-cmd-pngcrush-options):
* lisp/image-mode.el (image-toggle-display):
* lisp/international/ccl.el (ccl-compile-read-multibyte-character)
(ccl-compile-write-multibyte-character):
* lisp/international/kkc.el (kkc-save-init-file):
* lisp/international/latin1-disp.el (latin1-display):
* lisp/international/ogonek.el (ogonek-name-encoding-alist)
(ogonek-information, ogonek-lookup-encoding)
(ogonek-deprefixify-region):
* lisp/isearch.el (isearch-filter-predicate)
(isearch--momentary-message):
* lisp/jsonrpc.el (jsonrpc-connection-send)
(jsonrpc-process-connection, jsonrpc-shutdown)
(jsonrpc--async-request-1):
* lisp/language/tibet-util.el (tibetan-char-p):
* lisp/mail/feedmail.el (feedmail-queue-use-send-time-for-date)
(feedmail-last-chance-hook, feedmail-before-fcc-hook)
(feedmail-send-it-immediately-wrapper, feedmail-find-eoh):
* lisp/mail/hashcash.el (hashcash-generate-payment)
(hashcash-generate-payment-async, hashcash-insert-payment)
(hashcash-verify-payment):
* lisp/mail/rmail.el (rmail-movemail-variant-in-use)
(rmail-get-attr-value):
* lisp/mail/rmailmm.el (rmail-mime-prefer-html, rmail-mime):
* lisp/mail/rmailsum.el (rmail-summary-show-message):
* lisp/mail/supercite.el (sc-raw-mode-toggle):
* lisp/man.el (Man-start-calling):
* lisp/mh-e/mh-acros.el (mh-do-at-event-location)
(mh-iterate-on-messages-in-region, mh-iterate-on-range):
* lisp/mh-e/mh-alias.el (mh-alias-system-aliases)
(mh-alias-reload, mh-alias-ali)
(mh-alias-canonicalize-suggestion, mh-alias-add-alias-to-file)
(mh-alias-add-alias):
* lisp/mouse.el (mouse-save-then-kill):
* lisp/net/browse-url.el (browse-url-default-macosx-browser):
* lisp/net/eudc.el (eudc-set, eudc-variable-protocol-value)
(eudc-variable-server-value, eudc-update-variable)
(eudc-expand-inline):
* lisp/net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result):
* lisp/net/eudcb-ldap.el (eudc-ldap-get-field-list):
* lisp/net/pop3.el (pop3-list):
* lisp/net/soap-client.el (soap-namespace-put)
(soap-xs-parse-sequence, soap-parse-envelope):
* lisp/net/soap-inspect.el (soap-inspect-xs-complex-type):
* lisp/nxml/rng-xsd.el (rng-xsd-date-to-days):
* lisp/org/ob-C.el (org-babel-prep-session:C)
(org-babel-load-session:C):
* lisp/org/ob-J.el (org-babel-execute:J):
* lisp/org/ob-asymptote.el (org-babel-prep-session:asymptote):
* lisp/org/ob-awk.el (org-babel-execute:awk):
* lisp/org/ob-core.el (org-babel-process-file-name):
* lisp/org/ob-ebnf.el (org-babel-execute:ebnf):
* lisp/org/ob-forth.el (org-babel-execute:forth):
* lisp/org/ob-fortran.el (org-babel-execute:fortran)
(org-babel-prep-session:fortran, org-babel-load-session:fortran):
* lisp/org/ob-groovy.el (org-babel-execute:groovy):
* lisp/org/ob-io.el (org-babel-execute:io):
* lisp/org/ob-js.el (org-babel-execute:js):
* lisp/org/ob-lilypond.el (org-babel-default-header-args:lilypond)
(org-babel-lilypond-compile-post-tangle)
(org-babel-lilypond-display-pdf-post-tangle)
(org-babel-lilypond-tangle)
(org-babel-lilypond-execute-tangled-ly)
(org-babel-lilypond-compile-lilyfile)
(org-babel-lilypond-check-for-compile-error)
(org-babel-lilypond-process-compile-error)
(org-babel-lilypond-mark-error-line)
(org-babel-lilypond-parse-error-line)
(org-babel-lilypond-attempt-to-open-pdf)
(org-babel-lilypond-attempt-to-play-midi)
(org-babel-lilypond-switch-extension)
(org-babel-lilypond-set-header-args):
* lisp/org/ob-lua.el (org-babel-prep-session:lua):
* lisp/org/ob-picolisp.el (org-babel-execute:picolisp):
* lisp/org/ob-processing.el (org-babel-prep-session:processing):
* lisp/org/ob-python.el (org-babel-prep-session:python):
* lisp/org/ob-scheme.el (org-babel-scheme-capture-current-message)
(org-babel-scheme-execute-with-geiser, org-babel-execute:scheme):
* lisp/org/ob-shen.el (org-babel-execute:shen):
* lisp/org/org-agenda.el (org-agenda-entry-types)
(org-agenda-move-date-from-past-immediately-to-today)
(org-agenda-time-grid, org-agenda-sorting-strategy)
(org-agenda-filter-by-category, org-agenda-forward-block):
* lisp/org/org-colview.el (org-columns--overlay-text):
* lisp/org/org-faces.el (org-verbatim, org-cycle-level-faces):
* lisp/org/org-indent.el (org-indent-set-line-properties):
* lisp/org/org-macs.el (org-get-limited-outline-regexp):
* lisp/org/org-mobile.el (org-mobile-files):
* lisp/org/org.el (org-use-fast-todo-selection)
(org-extend-today-until, org-use-property-inheritance)
(org-refresh-effort-properties, org-open-at-point-global)
(org-track-ordered-property-with-tag, org-shiftright):
* lisp/org/ox-html.el (org-html-checkbox-type):
* lisp/org/ox-man.el (org-man-source-highlight)
(org-man-verse-block):
* lisp/org/ox-publish.el (org-publish-sitemap-default):
* lisp/outline.el (outline-head-from-level):
* lisp/progmodes/dcl-mode.el (dcl-back-to-indentation-1)
(dcl-calc-command-indent, dcl-indent-to):
* lisp/progmodes/flymake.el (flymake-make-diagnostic)
(flymake--overlays, flymake-diagnostic-functions)
(flymake-diagnostic-types-alist, flymake--backend-state)
(flymake-is-running, flymake--collect, flymake-mode):
* lisp/progmodes/gdb-mi.el (gdb-threads-list, gdb, gdb-non-stop)
(gdb-buffers, gdb-gud-context-call, gdb-jsonify-buffer):
* lisp/progmodes/grep.el (grep-error-screen-columns):
* lisp/progmodes/gud.el (gud-prev-expr):
* lisp/progmodes/ps-mode.el (ps-mode, ps-mode-target-column)
(ps-run-goto-error):
* lisp/progmodes/python.el (python-eldoc-get-doc)
(python-eldoc-function-timeout-permanent, python-eldoc-function):
* lisp/shadowfile.el (shadow-make-group):
* lisp/speedbar.el (speedbar-obj-do-check):
* lisp/textmodes/flyspell.el (flyspell-auto-correct-previous-hook):
* lisp/textmodes/reftex-cite.el (reftex-bib-or-thebib):
* lisp/textmodes/reftex-index.el (reftex-index-goto-entry)
(reftex-index-kill, reftex-index-undo):
* lisp/textmodes/reftex-parse.el (reftex-context-substring):
* lisp/textmodes/reftex.el (reftex-TeX-master-file):
* lisp/textmodes/rst.el (rst-next-hdr, rst-toc)
(rst-uncomment-region, rst-font-lock-extend-region-internal):
* lisp/thumbs.el (thumbs-mode):
* lisp/vc/ediff-util.el (ediff-restore-diff):
* lisp/vc/pcvs-defs.el (cvs-cvsroot, cvs-force-dir-tag):
* lisp/vc/vc-hg.el (vc-hg--ignore-patterns-valid-p):
* lisp/wid-edit.el (widget-field-value-set, string):
* lisp/x-dnd.el (x-dnd-version-from-flags)
(x-dnd-more-than-3-from-flags): Assorted docfixes.
2019-09-21 00:27:53 +02:00

461 lines
14 KiB
EmacsLisp

;;; ede/autoconf-edit.el --- Keymap for autoconf
;; Copyright (C) 1998-2000, 2009-2019 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <zappo@gnu.org>
;; Keywords: project
;; 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 <https://www.gnu.org/licenses/>.
;;; Commentary:
;;
;; Autoconf editing and modification support, and compatibility layer
;; for Emacses w/out autoconf mode built in.
;;; Code:
(require 'autoconf)
(declare-function ede-srecode-setup "ede/srecode")
(declare-function ede-srecode-insert "ede/srecode")
(defun autoconf-new-program (rootdir program testfile)
"Initialize a new configure.ac in ROOTDIR for PROGRAM using TESTFILE.
ROOTDIR is the root directory of a given autoconf controlled project.
PROGRAM is the program to be configured.
TESTFILE is the file used with AC_INIT.
Configure the initial configure script using `autoconf-new-automake-string'."
(interactive "DRoot Dir: \nsProgram: \nsTest File: ")
(require 'ede/srecode)
(if (bufferp rootdir)
(set-buffer rootdir)
(let ((cf1 (expand-file-name "configure.in" rootdir))
(cf2 (expand-file-name "configure.ac" rootdir)))
(if (and (or (file-exists-p cf1) (file-exists-p cf2))
(not (y-or-n-p (format "File %s exists. Start Over? "
(if (file-exists-p cf1)
cf1 cf2)
))))
(error "Quit"))
(find-file cf2)))
;; Note, we only ask about overwrite if a string/path is specified.
(erase-buffer)
(ede-srecode-setup)
(ede-srecode-insert
"file:ede-empty"
"TEST_FILE" testfile
"PROGRAM" program)
)
(defvar autoconf-preferred-macro-order
'("AC_INIT"
"AC_CONFIG_SRCDIR"
"AM_INIT_AUTOMAKE"
"AM_CONFIG_HEADER"
;; Arg parsing
"AC_ARG_ENABLE"
"AC_ARG_WITH"
;; Programs
"AC_PROG_MAKE_SET"
"AC_PROG_AWK"
"AC_PROG_CC"
"AC_PROG_CC_C_O"
"AC_PROG_CPP"
"AC_PROG_CXX"
"AC_PROG_CXXCPP"
"AC_ISC_POSIX"
"AC_PROG_F77"
"AC_PROG_GCC_TRADITIONAL"
"AC_PROG_INSTALL"
"AC_PROG_LEX"
"AC_PROG_LN_S"
"AC_PROG_RANLIB"
"AC_PROG_YACC"
"AC_CHECK_PROG"
"AC_CHECK_PROGS"
"AC_PROG_LIBTOOL"
;; Libraries
"AC_CHECK_LIB"
"AC_PATH_XTRA"
;; Headers
"AC_HEADER_STDC"
"AC_HEADER_SYS_WAIT"
"AC_HEADER_TIME"
"AC_HEADERS"
;; Typedefs, structures
"AC_TYPE_PID_T"
"AC_TYPE_SIGNAL"
"AC_TYPE_UID_T"
"AC_STRUCT_TM"
;; Compiler characteristics
"AC_CHECK_SIZEOF"
"AC_C_CONST"
;; Library functions
"AC_CHECK_FUNCS"
"AC_TRY_LINK"
;; System Services
;; Other
"AM_PATH_LISPDIR"
"AM_INIT_GUILE_MODULE"
;; AC_OUTPUT is always last
"AC_OUTPUT"
)
"List of macros in the order that they prefer to occur in.
This helps when inserting a macro which doesn't yet exist
by positioning it near other macros which may exist.
From the autoconf manual:
`AC_INIT(FILE)'
checks for programs
checks for libraries
checks for header files
checks for typedefs
checks for structures
checks for compiler characteristics
checks for library functions
checks for system services
`AC_OUTPUT([FILE...])'")
(defvar autoconf-multiple-macros
'("AC_ARG_ENABLE"
"AC_ARG_WITH"
"AC_CHECK_PROGS"
"AC_CHECK_LIB"
"AC_CHECK_SIZEOF"
"AC_TRY_LINK"
)
"Macros which appear multiple times.")
(defvar autoconf-multiple-multiple-macros
'("AC_HEADERS" "AC_CHECK_FUNCS")
"Macros which appear multiple times, and perform multiple queries.")
(defun autoconf-in-macro (macro)
"Non-nil if point is in a macro of type MACRO."
(save-excursion
(beginning-of-line)
(looking-at (concat "\\(A[CM]_" macro "\\|" macro "\\)"))))
(defun autoconf-find-last-macro (macro &optional ignore-bol)
"Move to the last occurrence of MACRO, and return that point.
The last macro is usually the one in which we would like to insert more
items such as CHECK_HEADERS."
(let ((op (point)) (atbol (if ignore-bol "" "^")))
(goto-char (point-max))
(if (re-search-backward (concat atbol (regexp-quote macro) "\\s-*\\((\\|$\\)") nil t)
(progn
(unless ignore-bol (beginning-of-line))
(point))
(goto-char op)
nil)))
(defun autoconf-parameter-strip (param)
"Strip the parameter PARAM of whitespace and miscellaneous characters."
;; force greedy match for \n.
(when (string-match "\\`\n*\\s-*\\[?\\s-*" param)
(setq param (substring param (match-end 0))))
(when (string-match "\\s-*\\]?\\s-*\\'" param)
(setq param (substring param 0 (match-beginning 0))))
;; Look for occurrences of backslash newline
(while (string-match "\\s-*\\\\\\s-*\n\\s-*" param)
(setq param (replace-match " " t t param)))
param)
(defun autoconf-parameters-for-macro (macro &optional ignore-bol ignore-case)
"Retrieve the parameters to MACRO.
Returns a list of the arguments passed into MACRO as strings."
(let ((case-fold-search ignore-case))
(save-excursion
(when (autoconf-find-last-macro macro ignore-bol)
(forward-sexp 1)
(mapcar
#'autoconf-parameter-strip
(when (looking-at "(")
(let* ((start (+ (point) 1))
(end (save-excursion
(forward-sexp 1)
(- (point) 1)))
(ans (buffer-substring-no-properties start end)))
(split-string ans "," t))))))))
(defun autoconf-position-for-macro (macro)
"Position the cursor where a new MACRO could be inserted.
This will appear at the BEGINNING of the macro MACRO should appear AFTER.
This is to make it compatible with `autoconf-find-last-macro'.
Assume that MACRO doesn't appear in the buffer yet, so search
the ordering list `autoconf-preferred-macro-order'."
;; Search this list backwards.. heh heh heh
;; This lets us do a reverse search easily.
(let ((ml (member macro (reverse autoconf-preferred-macro-order))))
(if (not ml) (error "Don't know how to position for %s yet" macro))
(setq ml (cdr ml))
(goto-char (point-max))
(while (and ml (not (autoconf-find-last-macro (car ml))))
(setq ml (cdr ml)))
(if (not ml) (error "Could not find context for positioning %s" macro))))
(defun autoconf-insert-macro-at-point (macro &optional param)
"Add MACRO at the current point with PARAM."
(insert macro)
(if param
(progn
(insert "(" param ")")
(if (< (current-column) 3) (insert " dnl")))))
(defun autoconf-insert-new-macro (macro &optional param)
"Add a call to MACRO in the current autoconf file.
Deals with macro order. See `autoconf-preferred-macro-order' and
`autoconf-multi-macros'.
Optional argument PARAM is the parameter to pass to the macro as one string."
(cond ((member macro autoconf-multiple-macros)
;; This occurs multiple times
(or (autoconf-find-last-macro macro)
(autoconf-position-for-macro macro))
(forward-sexp 2)
(end-of-line)
(insert "\n")
(autoconf-insert-macro-at-point macro param))
((member macro autoconf-multiple-multiple-macros)
(if (not param)
(error "You must have a parameter for %s" macro))
(if (not (autoconf-find-last-macro macro))
(progn
;; Doesn't exist yet....
(autoconf-position-for-macro macro)
(forward-sexp 2)
(end-of-line)
(insert "\n")
(autoconf-insert-macro-at-point macro param))
;; Does exist, can we fit onto the current line?
(forward-sexp 2)
(down-list -1)
(if (> (+ (current-column) (length param)) fill-column)
(insert " " param)
(up-list 1)
(end-of-line)
(insert "\n")
(autoconf-insert-macro-at-point macro param))))
((autoconf-find-last-macro macro)
;; If it isn't one of the multi's, it's a singleton.
;; If it exists, ignore it.
nil)
(t
(autoconf-position-for-macro macro)
(forward-sexp 1)
(if (looking-at "\\s-*(")
(forward-sexp 1))
(end-of-line)
(insert "\n")
(autoconf-insert-macro-at-point macro param))))
(defun autoconf-find-query-for-header (header)
"Position the cursor where HEADER is queried."
(interactive "sHeader: ")
(let ((op (point))
(found t))
(goto-char (point-min))
(condition-case nil
(while (not
(progn
(re-search-forward
(concat "\\b" (regexp-quote header) "\\b"))
(save-excursion
(beginning-of-line)
(looking-at "AC_CHECK_HEADERS")))))
;; We depend on the search failing to exit our loop on failure.
(error (setq found nil)))
(if (not found) (goto-char op))
found))
(defun autoconf-add-query-for-header (header)
"Add in HEADER to be queried for in our autoconf file."
(interactive "sHeader: ")
(or (autoconf-find-query-for-header header)
(autoconf-insert-new-macro "AC_CHECK_HEADERS" header)))
(defun autoconf-find-query-for-func (func)
"Position the cursor where FUNC is queried."
(interactive "sFunction: ")
(let ((op (point))
(found t))
(goto-char (point-min))
(condition-case nil
(while (not
(progn
(re-search-forward
(concat "\\b" (regexp-quote func) "\\b"))
(save-excursion
(beginning-of-line)
(looking-at "AC_CHECK_FUNCS")))))
;; We depend on the search failing to exit our loop on failure.
(error (setq found nil)))
(if (not found) (goto-char op))
found))
(defun autoconf-add-query-for-func (func)
"Add in FUNC to be queried for in our autoconf file."
(interactive "sFunction: ")
(or (autoconf-find-query-for-func func)
(autoconf-insert-new-macro "AC_CHECK_FUNCS" func)))
(defvar autoconf-program-builtin
'(("AWK" . "AC_PROG_AWK")
("CC" . "AC_PROG_CC")
("CPP" . "AC_PROG_CPP")
("CXX" . "AC_PROG_CXX")
("CXXCPP" . "AC_PROG_CXXCPP")
("F77" . "AC_PROG_F77")
("GCC_TRADITIONAL" . "AC_PROG_GCC_TRADITIONAL")
("INSTALL" . "AC_PROG_INSTALL")
("LEX" . "AC_PROG_LEX")
("LN_S" . "AC_PROG_LN_S")
("RANLIB" . "AC_PROG_RANLIB")
("YACC" . "AC_PROG_YACC")
)
"Association list of PROGRAM variables and their built-in MACRO.")
(defun autoconf-find-query-for-program (prog)
"Position the cursor where PROG is queried.
PROG is the VARIABLE to use in autoconf to identify the program.
PROG excludes the _PROG suffix. Thus if PROG were EMACS, then the
variable in configure.ac would be EMACS_PROG."
(let ((op (point))
(found t)
(builtin (assoc prog autoconf-program-builtin)))
(goto-char (point-min))
(condition-case nil
(re-search-forward
(concat "^"
(or (cdr-safe builtin)
(concat "AC_CHECK_PROG\\s-*(\\s-*" prog "_PROG"))
"\\>"))
(error (setq found nil)))
(if (not found) (goto-char op))
found))
(defun autoconf-add-query-for-program (prog &optional names)
"Add in PROG to be queried for in our autoconf file.
Optional NAMES is for non-built-in programs, and is the list
of possible names."
(interactive "sProgram: ")
(if (autoconf-find-query-for-program prog)
nil
(let ((builtin (assoc prog autoconf-program-builtin)))
(if builtin
(autoconf-insert-new-macro (cdr builtin))
;; Not built in, try the params item
(autoconf-insert-new-macro "AC_CHECK_PROGS" (concat prog "," names))
))))
;;; Scrappy little changes
;;
(defvar autoconf-deleted-text nil
"Set to the last bit of text deleted during an edit.")
(defvar autoconf-inserted-text nil
"Set to the last bit of text inserted during an edit.")
(defmacro autoconf-edit-cycle (&rest body)
"Start an edit cycle, unsetting the modified flag if there is no change.
Optional argument BODY is the code to execute which edits the autoconf file."
`(let ((autoconf-deleted-text nil)
(autoconf-inserted-text nil)
(mod (buffer-modified-p)))
,@body
(if (and (not mod)
(string= autoconf-deleted-text autoconf-inserted-text))
(set-buffer-modified-p nil))))
(defun autoconf-parameter-count ()
"Return the number of parameters to the function on the current line."
(save-excursion
(beginning-of-line)
(let* ((end-of-cmd
(save-excursion
(if (re-search-forward "(" (point-at-eol) t)
(progn
(forward-char -1)
(forward-sexp 1)
(point))
;; Else, just return EOL.
(point-at-eol))))
(cnt 0))
(save-restriction
(narrow-to-region (point-at-bol) end-of-cmd)
(condition-case nil
(progn
(down-list 1)
(while (re-search-forward ", ?" end-of-cmd t)
(setq cnt (1+ cnt)))
(cond ((> cnt 1)
;; If the # is > 1, then there is one fewer , than args.
(1+ cnt))
((not (looking-at "\\s-*)"))
;; If there are 0 args, then we have to see if there is one arg.
(1+ cnt))
(t
;; Else, just return the 0.
cnt)))
(error 0))))))
(defun autoconf-delete-parameter (index)
"Delete the INDEXth parameter from the macro starting on the current line.
Leaves the cursor where a new parameter can be inserted.
INDEX starts at 1."
(beginning-of-line)
(down-list 1)
(re-search-forward ", ?" nil nil (1- index))
(let ((end (save-excursion
(re-search-forward ",\\|)" (point-at-eol))
(forward-char -1)
(point))))
(setq autoconf-deleted-text (buffer-substring (point) end))
(delete-region (point) end)))
(defun autoconf-insert (text)
"Insert TEXT."
(setq autoconf-inserted-text text)
(insert text))
(defun autoconf-set-version (version)
"Set the version used with automake to VERSION."
(if (not (stringp version))
(signal 'wrong-type-argument '(stringp version)))
(if (and (autoconf-find-last-macro "AM_INIT_AUTOMAKE")
(>= (autoconf-parameter-count) 2))
;; We can edit right here.
nil
;; Else, look for AC init instead.
(if (not (and (autoconf-find-last-macro "AC_INIT")
(>= (autoconf-parameter-count) 2)))
(error "Cannot update version")))
;; Perform the edit.
(autoconf-edit-cycle
(autoconf-delete-parameter 2)
(autoconf-insert (concat "[" version "]"))))
(defun autoconf-set-output (outputlist)
"Set the files created in AC_OUTPUT to OUTPUTLIST.
OUTPUTLIST is a list of strings representing relative paths
to Makefiles, or other files using Autoconf substitution."
(if (not (autoconf-find-last-macro "AC_OUTPUT"))
(error "Cannot update version")
(autoconf-edit-cycle
(autoconf-delete-parameter 1)
(autoconf-insert (mapconcat (lambda (a) a) outputlist " ")))))
(provide 'ede/autoconf-edit)
;;; ede/autoconf-edit.el ends here