Skip to content

GitLab

emacs
emacs
Commit e5d77022 authored by Jim Blandy's avatar Jim Blandy
Browse files
Options

*** empty log message ***

parent 53b0a6f8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 518 additions and 406 deletions
configure1.in
View file @ e5d77022
......@@ -68,7 +68,7 @@ unsuccessful after disturbing the status quo, config.status is removed."
if [ ! -r ./src/lisp.h ]; then
echo "${progname}: Can't find Emacs sources in \`./src'.
Run this config script in the top directory of the Emacs source tree." 1>&2
Run this config script in the top directory of the Emacs source tree." >&2
exit 1
fi
......@@ -139,7 +139,11 @@ while [ $# != 0 ]; do
;;
*:${opt}*:${opt}*:* ) # Ambiguous prefix.
echo "\`-${opt}' is an ambiguous switch; it could be any of the following:"
echo `echo ${options} | tr ':' '\012' | grep '^'${opt}`
# We can't just use tr to translate colons to newlines, since
# BSD sed and SYSV sed use different syntaxes for that.
spaced_options=`echo ${options} | tr ':' ' '`
echo `(for option in ${spaced_options}; do echo $option; done) \
| grep "^${opt}"`
echo ${short_usage}
exit 1
;;
......@@ -170,7 +174,7 @@ while [ $# != 0 ]; do
n | no ) val=no ;;
* )
echo "The \`-${optvar}' option (\`-${opt}') is supposed to have a boolean
value - set it to either \`yes' or \`no'." 1>&2
value - set it to either \`yes' or \`no'." >&2
exit 1
;;
esac
......@@ -208,7 +212,7 @@ machfile="m/${machine}.h"
if [ ! -r src/${machfile} ]; then
echo "${progname}: Emacs has no configuration info for the machine called
\`${machine}'. Look at etc/MACHINES for the names of machines
that Emacs has been ported to." 1>&2
that Emacs has been ported to." >&2
exit 1
fi
......@@ -226,7 +230,7 @@ if [ "${opsystem}" = "" ]; then
system a \`${machine}' machine might run. Try specifying the
operating system explicitly by passing ${progname} an
\`-opsystem=SYSTEM-NAME' flag. Look at etc/MACHINES for the
names of operating systems that Emacs has been ported to." 1>&2
names of operating systems that Emacs has been ported to." >&2
exit 1
fi
......@@ -238,7 +242,7 @@ out which one you're running. Run ${progname} with -machine and
(This information comes from the file \`etc/MACHINES' - see that
file for more detail.)
" 1>&2
" >&2
sed < src/${machfile} -e '1,/NOTE-START/d' -e '/NOTE-END/,$d' | more
echo
exit 1
......@@ -250,7 +254,7 @@ file for more detail.)
operating system for the machine \`${machine}' is \`${opsystem}',
but there is no configuration file for \`${opsystem}', so Emacs's
default info is screwed up. Try specifying the operating system
explicitly by passing ${progname} an \`-opsystem=SYSTEM-NAME' flag." 1>&2
explicitly by passing ${progname} an \`-opsystem=SYSTEM-NAME' flag." >&2
exit 1
fi
else
......@@ -258,7 +262,7 @@ else
if [ ! -r src/${opsysfile} ]; then
echo "${progname}: Emacs has no configuration info for the operating system
\`${opsystem}'. Look at etc/MACHINES for the names of operating
systems that Emacs has been ported to." 1>&2
systems that Emacs has been ported to." >&2
exit 1
fi
fi
......@@ -312,7 +316,9 @@ if [ ! "${infodir}" ]; then
fi
echo "Checking window system."
window_system="`echo ${window_system} | tr A-Z a-z`"
# Note that SYSV `tr' doesn't handle character ranges.
window_system="`echo ${window_system} \
| tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`"
case "${window_system}" in
"none" | "x11" | "x10" ) ;;
"x" ) window_system=x11 ;;
......@@ -324,7 +330,7 @@ case "${window_system}" in
fi
;;
* )
echo "The \`-window_system' option must be set to \`none' or \`X11'." 1>&2
echo "The \`-window_system' option must be set to \`none' or \`X11'." >&2
exit 1
;;
esac
......@@ -463,6 +469,7 @@ esac
sed_flags="-e 's:@machine@:${machfile}:'"
sed_flags="${sed_flags} -e 's:@opsystem@:${opsysfile}:'"
for flag in `echo ${config_h_opts} | tr ':' ' '`; do
# Note that SYSV `tr' doesn't handle character ranges.
cflagname=`echo ${flag} \
| tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
val=`eval echo '$'${flag}`
......@@ -562,28 +569,28 @@ if [ "${highpri}" ]; then
else
desc_highpri="none"
fi
message="# Configured for machine \`${machine}' running \`${opsystem}'.
# The following values have been set in ./Makefile and ./build-install:
# Executables will be placed in
# ${bindir}.
# Emacs's lisp search path will be
# \`${lisppath}'.
# Emacs will look for its architecture-independent data in
# ${datadir}.
# Emacs will look for its utility programs and other architecture-
# dependent data in
# ${libdir}.
# Emacs will keep track of file-locking in
# ${lockdir}.
# The following values have been set in src/config.h:
# At how much higher than normal priority should Emacs run? ${desc_highpri}
# Should Emacs use the GNU version of malloc? ${gnu_malloc}${gnu_malloc_reason}
# Should Emacs use the relocating allocator for buffers? ${rel_alloc}
# Should Emacs support a floating point Elisp type? ${lisp_float_type}
# What window system should Emacs use? ${window_system}
# Should Emacs support mouse menus, which require X11? ${have_x_menu}
# What compiler should emacs be built with? ${cc}
# Should the compilation use \`-g' and/or \`-O'? ${c_switch_site- neither}"
message="Configured for machine \`${machine}' running \`${opsystem}'.
The following values have been set in ./Makefile and ./build-install:
\`make install' or \`build-install' will placed executables in
${bindir}.
Emacs's lisp search path will be
\`${lisppath}'.
Emacs will look for its architecture-independent data in
${datadir}.
Emacs will look for its utility programs and other architecture-
dependent data in
${libdir}.
Emacs will keep track of file-locking in
${lockdir}.
The following values have been set in src/config.h:
At how much higher than normal priority should Emacs run? ${desc_highpri}
Should Emacs use the GNU version of malloc? ${gnu_malloc}${gnu_malloc_reason}
Should Emacs use the relocating allocator for buffers? ${rel_alloc}
Should Emacs support a floating point Elisp type? ${lisp_float_type}
What window system should Emacs use? ${window_system}
Should Emacs support mouse menus, which require X11? ${have_x_menu}
What compiler should emacs be built with? ${cc}
Should the compilation use \`-g' and/or \`-O'? ${c_switch_site- neither}"
# Document the damage we have done by writing config.status.
......@@ -593,7 +600,7 @@ echo "# This file is generated by \`${progname}.'
# If you are thinking about editing it, you should seriously consider
# running \`${progname}' instead.
" >> config.status
echo "${message}" >> config.status
echo "${message}" | sed -e 's/^/# /' >> config.status
echo "'./${progname}' ${arguments} "'$@' >> config.status
# Remind people not to edit this.
chmod -w config.status
......@@ -601,6 +608,6 @@ chmod +x config.status
# Print the description.
echo
echo "${message}" | sed -e 's/^# //'
echo "${message}"
exit 0
lisp/abbrev.el
View file @ e5d77022
......@@ -19,7 +19,6 @@
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;;###autoload
(defconst only-global-abbrevs nil "\
*t means user plans to use global abbrevs only.
Makes the commands to define mode-specific abbrevs define global ones instead.")
......
lisp/calendar/calendar.el
View file @ e5d77022
This diff is collapsed.
lisp/calendar/holidays.el
View file @ e5d77022
;;; holidays.el --- holiday functions for the calendar package
;; Copyright (C) 1989, 1990, 1991 Free Software Foundation, Inc.
;;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
......@@ -34,6 +33,8 @@
;; pages 899-928.
(require 'calendar)
;;;###autoload
(defun holidays ()
"Display the holidays for last month, this month, and next month.
This function is suitable for execution in a .emacs file."
......@@ -62,7 +63,8 @@ The holidays are those in the list calendar-holidays."
"Find holidays for the date specified by the cursor in the calendar window."
(interactive)
(message "Checking holidays...")
(let* ((date (calendar-cursor-to-date))
(let* ((date (or (calendar-cursor-to-date)
(error "Cursor is not on a date!")))
(date-string (calendar-date-string date))
(holiday-list (check-calendar-holidays date))
(holiday-string (mapconcat 'identity holiday-list "; "))
......
lisp/completion.el
View file @ e5d77022
......@@ -2834,8 +2834,8 @@ Patched to remove the most recent completion."
(use-completion-before-separator)
(self-insert-command arg)
(and (> (current-column) fill-column)
auto-fill-hook
(funcall auto-fill-hook))
auto-fill-function
(funcall auto-fill-function))
)
;;;-----------------------------------------------
......
lisp/diary-lib.el
View file @ e5d77022
;;; diary.el --- diary functions.
;; Copyright (C) 1989, 1990, 1991 Free Software Foundation, Inc.
;; Copyright (C) 1989, 1990 Free Software Foundation, Inc.
;; This file is part of GNU Emacs.
......@@ -29,6 +28,8 @@
;; Urbana, Illinois 61801
(require 'calendar)
;;;###autoload
(defun diary (&optional arg)
"Generate the diary window for ARG days starting with the current date.
If no argument is provided, the number of days of diary entries is governed
......@@ -1254,8 +1255,8 @@ ending of that number (that is, `st', `nd', `rd' or `th', as appropriate."
(defun diary-ordinal-suffix (n)
"Ordinal suffix for N. (That is, `st', `nd', `rd', or `th', as appropriate.)"
(if (or (and (< 9 n) (< n 20))
(memq (% n 10) '(4 5 6 7 8 9 0)))
(if (or (memq (% n 100) '(11 12 13))
(< 3 (% n 10)))
"th"
(aref ["th" "st" "nd" "rd"] (% n 10))))
......@@ -1374,8 +1375,8 @@ order of the parameters is changed to DEATH-DAY, DEATH-MONTH, DEATH-YEAR."
(t "th"))))))
(defun diary-rosh-hodesh ()
"Rosh Hodesh diary entry--entry applies if date is Rosh Hodesh or the
Saturday before."
"Rosh Hodesh diary entry--entry applies if date is Rosh Hodesh, the day
before, or the Saturday before."
(let* ((d (calendar-absolute-from-gregorian date))
(h-date (calendar-hebrew-from-absolute d))
(h-month (extract-calendar-month h-date))
......@@ -1415,9 +1416,18 @@ Saturday before."
((and (< h-day 30) (> h-day 22) (= 30 last-day))
(format "Mevarhim Rosh Hodesh %s (%s-%s)"
(aref h-month-names h-month)
(aref calendar-day-name-array (- 29 h-day))
(if (= h-day 29)
"tomorrow"
(aref calendar-day-name-array (- 29 h-day)))
(aref calendar-day-name-array
(mod (- 30 h-day) 7)))))))))
(mod (- 30 h-day) 7)))))
(if (and (= h-day 29) (/= h-month 6))
(format "Erev Rosh Hodesh %s"
(aref h-month-names
(if (= h-month
(hebrew-calendar-last-month-of-year
h-year))
0 h-month))))))))
(defun diary-parasha ()
"Parasha diary entry--entry applies if date is a Saturday."
......@@ -1606,39 +1616,6 @@ start on Tuesday.")
(aref hebrew-calendar-parashiot-names (aref p 1)))
(aref hebrew-calendar-parashiot-names p)))
(defun hebrew-calendar-yahrzeit (death-date year)
"Absolute date of the anniversary of Hebrew DEATH-DATE in Hebrew YEAR."
(let* ((death-day (extract-calendar-day death-date))
(death-month (extract-calendar-month death-date))
(death-year (extract-calendar-year death-date)))
(cond
;; If it's Heshvan 30 it depends on the first anniversary; if
;; that was not Heshvan 30, use the day before Kislev 1.
((and (= death-month 8)
(= death-day 30)
(not (hebrew-calendar-long-heshvan-p (1+ death-year))))
(1- (calendar-absolute-from-hebrew (list 9 1 year))))
;; If it's Kislev 30 it depends on the first anniversary; if
;; that was not Kislev 30, use the day before Teveth 1.
((and (= death-month 9)
(= death-day 30)
(hebrew-calendar-short-kislev-p (1+ death-year)))
(1- (calendar-absolute-from-hebrew (list 10 1 year))))
;; If it's Adar II, use the same day in last month of
;; year (Adar or Adar II).
((= death-month 13)
(calendar-absolute-from-hebrew
(list (last-month-of-hebrew-year year) death-day year)))
;; If it's the 30th in Adar I and $year$ is not a leap year
;; (so Adar has only 29 days), use the last day in Shevat.
((and (= death-day 30)
(= death-month 12)
(not (hebrew-calendar-leap-year-p death-year)))
(calendar-absolute-from-hebrew (list 11 30 year)))
;; In all other cases, use the normal anniversary of the date of death.
(t (calendar-absolute-from-hebrew
(list death-month death-day year))))))
(defun list-islamic-diary-entries ()
"Add any Islamic date entries from the diary-file to diary-entries-list.
Islamic date diary entries must be prefaced by an islamic-diary-entry-symbol
......
lisp/emacs-lisp/autoload.el
View file @ e5d77022
......@@ -107,7 +107,7 @@ are used."
;; under a different path on another system,
;; `update-autoloads-here' won't be able to find the files to be
;; autoloaded. So, if FILE is in the same directory or a
;; subdirectory of the current buffer's file, we'll make it
;; subdirectory of the current buffer's directory, we'll make it
;; relative to the current buffer's directory.
(setq file (expand-file-name file))
(if (and (< (length default-directory) (length file))
......
lisp/help.el
View file @ e5d77022
......@@ -18,7 +18,6 @@
;; along with GNU Emacs; see the file COPYING. If not, write to
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;;###autoload
(defvar help-map (make-sparse-keymap)
"Keymap for characters following the Help key.")
......@@ -42,6 +41,8 @@
(define-key help-map "f" 'describe-function)
(define-key help-map "i" 'info)
(define-key help-map "\C-f" 'Info-goto-emacs-command-node)
(define-key help-map "\C-k" 'Info-goto-emacs-key-command-node)
(define-key help-map "l" 'view-lossage)
......
lisp/indent.el
View file @ e5d77022
......@@ -19,7 +19,6 @@
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;;###autoload
(defvar indent-line-function 'indent-to-left-margin "\
Function to indent current line.");Now in loaddefs.el
......
lisp/info.el
View file @ e5d77022
......@@ -978,8 +978,6 @@ The locations are of the format used in Info-history, i.e.
(if (> num-matches 2) "ies" "y")
(if (> num-matches 2) "them" "it"))))))
(error "Couldn't find documentation for %s." command))))
;;;###autoload
(define-key help-map "\C-f" 'Info-goto-emacs-command-node)
;;;###autoload
(defun Info-goto-emacs-key-command-node (key)
......@@ -995,8 +993,6 @@ Interactively, if the binding is execute-extended-command, a command is read."
(read-command "Find documentation for command: ")))
(t
(Info-goto-emacs-command-node command)))))
;;;###autoload
(define-key help-map "\C-k" 'Info-goto-emacs-key-command-node)
(provide 'info)
......
lisp/isearch-old.el
View file @ e5d77022
......@@ -18,59 +18,45 @@
;; along with GNU Emacs; see the file COPYING. If not, write to
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;;###autoload
(defvar search-last-string "" "\
Last string search for by a non-regexp search command.
This does not include direct calls to the primitive search functions,
and does not include searches that are aborted.")
;;;###autoload
(defvar search-last-regexp "" "\
Last string searched for by a regexp search command.
This does not include direct calls to the primitive search functions,
and does not include searches that are aborted.")
;;;###autoload
(defconst search-repeat-char ?\C-s "\
*Character to repeat incremental search forwards.")
;;;###autoload
(defconst search-reverse-char ?\C-r "\
*Character to repeat incremental search backwards.")
;;;###autoload
(defconst search-exit-char ?\C-m "\
*Character to exit incremental search.")
;;;###autoload
(defconst search-delete-char ?\177 "\
*Character to delete from incremental search string.")
;;;###autoload
(defconst search-quote-char ?\C-q "\
*Character to quote special characters for incremental search.")
;;;###autoload
(defconst search-yank-word-char ?\C-w "\
*Character to pull next word from buffer into search string.")
;;;###autoload
(defconst search-yank-line-char ?\C-y "\
*Character to pull rest of line from buffer into search string.")
;;;###autoload
(defconst search-ring-advance-char ?\M-n "\
*Character to pull next (more recent) search string from the ring of same.")
;;;###autoload
(defconst search-ring-retreat-char ?\M-p "\
*Character to pull previous (older) search string from the ring of same.")
;;;###autoload
(defconst search-exit-option t "\
*Non-nil means random control characters terminate incremental search.")
;;;###autoload
(defvar search-slow-window-lines 1 "\
*Number of lines in slow search display windows.
These are the short windows used during incremental search on slow terminals.
Negative means put the slow search window at the top (normally it's at bottom)
and the value is minus the number of lines.")
;;;###autoload
(defvar search-slow-speed 1200 "\
*Highest terminal speed at which to use \"slow\" style incremental search.
This is the style where a one-line window is created to show the line
......@@ -104,7 +90,6 @@ Each element is a cons cell of the form (STRING . UPPERCASE-FLAG).")
thing searched for.")
;;;###autoload
(defun isearch-forward ()
"Do incremental search forward.
As you type characters, they add to the search string and are found.
......@@ -123,36 +108,29 @@ C-g while searching or when search has failed
C-g when search is successful aborts and moves point to starting point."
(interactive)
(isearch t))
;;;###autoload
(define-key global-map "\C-s" 'isearch-forward)
;;;###autoload
(defun isearch-forward-regexp ()
"Do incremental search forward for regular expression.
Like ordinary incremental search except that your input
is treated as a regexp. See \\[isearch-forward] for more info."
(interactive)
(isearch t t))
;;;###autoload
(define-key esc-map "\C-s" 'isearch-forward-regexp)
;;;###autoload
(defun isearch-backward ()
"Do incremental search backward.
See \\[isearch-forward] for more information."
(interactive)
(isearch nil))
;;;###autoload
(define-key global-map "\C-r" 'isearch-backward)
;;;###autoload
(defun isearch-backward-regexp ()
"Do incremental search backward for regular expression.
Like ordinary incremental search except that your input
is treated as a regexp. See \\[isearch-forward] for more info."
(interactive)
(isearch nil t))
;;;###autoload
(define-key esc-map "\C-r" 'isearch-backward-regexp)
......
lisp/progmodes/compile.el
View file @ e5d77022
......@@ -272,6 +272,7 @@ means the default). The defaults for these variables are the global values of
(set-buffer outbuf)
(compilation-mode)
(buffer-disable-undo (current-buffer))
(setq buffer-read-only t)
(set (make-local-variable 'compilation-parse-errors-function) parser)
(set (make-local-variable 'compilation-error-message) error-message)
(set (make-local-variable 'compilation-error-regexp-alist) regexp-alist)
......@@ -343,6 +344,7 @@ Runs `compilation-mode-hook' with `run-hooks' (which see)."
;; Write something in the compilation buffer
;; and hack its mode line.
(set-buffer buffer)
(setq buffer-read-only nil)
(setq omax (point-max)
opoint (point))
(goto-char omax)
......@@ -360,7 +362,8 @@ Runs `compilation-mode-hook' with `run-hooks' (which see)."
;; will stay around until M-x list-processes.
(delete-process proc))
;; Force mode line redisplay soon.
(set-buffer-modified-p (buffer-modified-p)))
(set-buffer-modified-p (buffer-modified-p))
(setq buffer-read-only t))
(if (and opoint (< opoint omax))
(goto-char opoint))
(set-buffer obuf)
......
lisp/replace.el
View file @ e5d77022
;;; replace.el --- replace commands for Emacs.
;; Copyright (C) 1985-1991 Free Software Foundation, Inc.
;; Copyright (C) 1985, 86, 87, 88, 89, 90, 91, 92 Free Software Foundation, Inc.
;; 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 1, or (at your option)
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
......@@ -19,11 +19,9 @@
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;;###autoload
(defconst case-replace t "\
*Non-nil means query-replace should preserve case in replacements.")
;;;###autoload
(defun query-replace (from-string to-string &optional arg)
"Replace some occurrences of FROM-STRING with TO-STRING.
As each match is found, the user must type a character saying
......@@ -36,10 +34,8 @@ only matches surrounded by word boundaries."
(interactive "sQuery replace: \nsQuery replace %s with: \nP")
(perform-replace from-string to-string t nil arg)
(message "Done"))
;;;###autoload
(define-key esc-map "%" 'query-replace)
;;;###autoload
(defun query-replace-regexp (regexp to-string &optional arg)
"Replace some things after point matching REGEXP with TO-STRING.
As each match is found, the user must type a character saying
......@@ -55,7 +51,6 @@ and \\=\\<n> means insert what matched <n>th \\(...\\) in REGEXP."
(perform-replace regexp to-string t t arg)
(message "Done"))
;;;###autoload
(defun map-query-replace-regexp (regexp to-strings &optional arg)
"Replace some matches for REGEXP with various strings, in rotation.
The second argument TO-STRINGS contains the replacement strings, separated
......@@ -84,7 +79,6 @@ before rotating to the next."
(perform-replace regexp replacements t t nil arg))
(message "Done"))
;;;###autoload
(defun replace-string (from-string to-string &optional delimited)
"Replace occurrences of FROM-STRING with TO-STRING.
Preserve case in each match if `case-replace' and `case-fold-search'
......@@ -101,7 +95,6 @@ which will run faster and will not set the mark or print anything."
(perform-replace from-string to-string nil nil delimited)
(message "Done"))
;;;###autoload
(defun replace-regexp (regexp to-string &optional delimited)
"Replace things after point matching REGEXP with TO-STRING.
Preserve case in each match if case-replace and case-fold-search
......@@ -348,7 +341,6 @@ C-l to clear the screen, redisplay, and offer same replacement again,
^ to move point back to previous match."
"Help message while in query-replace")
;;;###autoload
(defun perform-replace (from-string replacements
query-flag regexp-flag delimited-flag
&optional repeat-count)
......@@ -364,6 +356,7 @@ which will run faster and do exactly what you probably want."
(literal (not regexp-flag))
(search-function (if regexp-flag 're-search-forward 'search-forward))
(search-string from-string)
(real-match-data nil) ; the match data for the current match
(next-replacement nil)
(replacement-index 0)
(keep-going t)
......@@ -400,6 +393,10 @@ which will run faster and do exactly what you probably want."
(forward-char 1)
(funcall search-function search-string nil t))
t))
;; Save the data associated with the real match.
(setq real-match-data (match-data))
;; Before we make the replacement, decide whether the search string
;; can match again just after this match.
(if regexp-flag
......@@ -414,15 +411,13 @@ which will run faster and do exactly what you probably want."
(setq replacement-index (% (1+ replacement-index) (length replacements)))))
(if (not query-flag)
(progn
(store-match-data real-match-data)
(replace-match next-replacement nocasify literal)
(setq replace-count (1+ replace-count)))
(undo-boundary)
(let (done replaced)
(while (not done)
;; Preserve the match data. Process filters and sentinels
;; could run inside read-char..
(let ((data (match-data))
(help-form
(let ((help-form
'(concat "Query replacing "
(if regexp-flag "regexp " "")
from-string " with " next-replacement ".\n\n"
......@@ -432,8 +427,9 @@ which will run faster and do exactly what you probably want."
(message "Query replacing %s with %s: " from-string next-replacement)
(setq char (read-event))
(if (and (numberp char) (= char ??))
(setq unread-command-char help-char char help-char)))
(store-match-data data))
(setq unread-command-char help-char char help-char))))
;; Restore the match data while we process the command.
(store-match-data real-match-data)
(cond ((or (= char ?\e)
(= char ?q))
(setq keep-going nil)
......
lisp/textmodes/fill.el
View file @ e5d77022
......@@ -321,4 +321,4 @@ MAIL-FLAG for a mail message, i. e. don't fill header lines."
(fill-region-as-paragraph start (point) justifyp)
(or had-newline (delete-char -1))))))))
;;; fill.el ends here
\ No newline at end of file
;;; fill.el ends here
lisp/textmodes/paragraphs.el
View file @ e5d77022
......@@ -19,25 +19,20 @@
;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
;;;###autoload
(defconst paragraph-start "^[ \t\n\f]" "\
*Regexp for beginning of a line that starts OR separates paragraphs.")
;;;###autoload
(defconst paragraph-separate "^[ \t\f]*$" "\
*Regexp for beginning of a line that separates paragraphs.
If you change this, you may have to change paragraph-start also.")
;;;###autoload
(defconst sentence-end (purecopy "[.?!][]\"')}]*\\($\\| $\\|\t\\| \\)[ \t\n]*") "\
*Regexp describing the end of a sentence.
All paragraph boundaries also end sentences, regardless.")
;;;###autoload
(defconst page-delimiter "^\014" "\
*Regexp describing line-beginnings that separate pages.")
;;;###autoload
(defvar paragraph-ignore-fill-prefix nil "\
Non-nil means the paragraph commands are not affected by `fill-prefix'.
This is desirable in modes where blank lines are the paragraph delimiters.")
......
lisp/textmodes/texnfo-upd.el
View file @ e5d77022
......@@ -2,13 +2,13 @@
;;;; Version 2.00 14 Dec 1990
;;;; Copyright 1989, 1990 Free Software Foundation
;;;; Copyright 1989, 1990, 1992 Free Software Foundation
;; 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 1, or (at your option)
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
......@@ -1031,13 +1031,13 @@ which menu descriptions are indented. Its default value is 24."
(interactive "P")
(if (not region-p)
(let ((auto-fill-hook nil)) ; update a single node
(let ((auto-fill-function nil)) ; update a single node
(if (not (re-search-backward "^@node" (point-min) t))
(error "Node line not found before this position."))
(texinfo-update-the-node)
(message "Done...updated the node. You may save the buffer."))
;; else
(let ((auto-fill-hook nil)
(let ((auto-fill-function nil)
(beginning (region-beginning))
(end (region-end)))
(if (= end beginning)
......@@ -1245,14 +1245,14 @@ Info `g*' command is inadequate."
(interactive "P")
(if (not region-p)
(let ((auto-fill-hook nil)) ; update a single node
(let ((auto-fill-function nil)) ; update a single node
(if (not (re-search-backward "^@node" (point-min) t))
(error "Node line not found before this position."))
(texinfo-sequentially-update-the-node)
(message
"Done...sequentially updated the node . You may save the buffer."))
;; else
(let ((auto-fill-hook nil)
(let ((auto-fill-function nil)
(beginning (region-beginning))
(end (region-end)))
(if (= end beginning)
......