diff options
52 files changed, 256 insertions, 113 deletions
@@ -1,5 +1,24 @@ 2012-05-02 Glenn Morris <[email protected]> + * Makefile.in (uninstall): Remove useless-use-of-for; that for + some reason caused problems on an old Solaris. + + * Makefile.in (install-arch-indep, uninstall): + Ensure that INSTALL-type commands are run from top-level. + + * Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally + omitted from 2012-04-12 backport from trunk. + + * info/dir: Make some entries consistent with the source texi files. + + * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04. + + * info/dir: Make some entries consistent with the source texi files. + + * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04. + +2012-05-02 Glenn Morris <[email protected]> + * Makefile.in (install-arch-indep): Combine adjacent install-data and install-info loops. diff --git a/Makefile.in b/Makefile.in index b7ec97c3c9..4b225fffd5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -232,6 +232,11 @@ gamedir=@gamedir@ # ==================== Utility Programs for the Build ==================== # Allow the user to specify the install program. +# Note that if the system does not provide a suitable install, +# configure will use build-aux/install-sh. Annoyingly, it does +# not use an absolute path. So we must take care to always run +# INSTALL-type commands from the top-level directory. +# This explains (I think) the cd thisdir seen in several install rules. INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ @@ -616,7 +621,8 @@ install-arch-indep: mkdir info install-etc for elt in $(INFO_FILES); do \ test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ - ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ + (cd $${thisdir}; \ + ${INSTALL_DATA} ${srcdir}/info/$$f $(DESTDIR)${infodir}/$$f); \ chmod a+r $(DESTDIR)${infodir}/$$f; \ if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ rm -f $(DESTDIR)${infodir}/$$f.gz; \ @@ -711,14 +717,14 @@ uninstall: fi ; \ done -rm -rf $(DESTDIR)${libexecdir}/emacs/${version} + thisdir=`/bin/pwd`; \ (cd $(DESTDIR)${infodir} && \ for elt in $(INFO_FILES); do \ - $(INSTALL_INFO) --remove --info-dir=. $$elt; \ + (cd $${thisdir}; \ + $(INSTALL_INFO) --remove --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ ext=.gz; else ext=; fi; \ - for f in `ls $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext 2>/dev/null`; do \ - rm -f $$f; \ - done; \ + rm -f $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext; \ done;) (if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ ext=.gz; else ext=; fi; \ diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index f53b74e98c..e03e1ad98b 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -37,6 +37,7 @@ Regenerate the pdf versions in etc/refcards/. What paper size are the English versions supposed to be on? On Debian testing, the packages texlive-lang-czechslovak and texlive-lang-polish will let you generate the cs-* and sk-* pdfs. +(You may need texlive-lang-cyrillic, texlive-lang-german for others.) The Makefile rules did not work for me, I had to use something like: csplain -output-format=pdf cs-refcard diff --git a/configure.in b/configure.in index 2c2ccccc11..c0a12672c6 100644 --- a/configure.in +++ b/configure.in @@ -2931,9 +2931,7 @@ fail; ;; netbsd) - if test $ac_cv_search_tputs = -lterminfo; then - LIBS_TERMCAP="-lterminfo" - else + if [ "x$LIBS_TERMCAP" != "x-lterminfo" ]; then TERMINFO=no LIBS_TERMCAP="-ltermcap" fi diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 1a785ffa4c..81064afacd 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,22 @@ +2012-05-02 Glenn Morris <[email protected]> + + * emacs.texi (@copying): Only print EDITION in the TeX version. + + * search.texi (Regexp Search): Just say "Emacs". + + * display.texi (Auto Scrolling): + Reword to avoid repetition and improve page break. + + * xresources.texi (Resources): + * mule.texi (Language Environments): + * misc.texi (Amusements): + * maintaining.texi (VC Change Log): + * frames.texi (Fonts): + * custom.texi (Specifying File Variables, Minibuffer Maps): + * cmdargs.texi (Initial Options): + * building.texi (Flymake): + Reword to remove/reduce some overly long/short lines. + 2012-04-27 Glenn Morris <[email protected]> * emacs.texi: Some fixes for detailed menu. @@ -9213,7 +9232,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index 4b92376b8a..999afa7df2 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -426,11 +426,11 @@ syntax checking tool used depends on the language; for example, for C/C++ files this is usually the C compiler. Flymake can also use build tools such as @code{make} for checking complicated projects. - To enable Flymake mode, type @kbd{M-x flymake-mode}. You can go to -the errors found by Flymake mode with @kbd{M-x -flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}. To -display any error messages associated with the current line, use -@kbd{M-x flymake-display-err-menu-for-current-line}. + To enable Flymake mode, type @kbd{M-x flymake-mode}. You can jump to +the errors that it finds by using @kbd{M-x +flymake-goto-next-error} and @kbd{M-x flymake-goto-prev-error}. +Use the command @kbd{M-x flymake-display-err-menu-for-current-line} +to display any error messages associated with the current line. For more details about using Flymake, @ifnottex diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 222aa0f843..c387b99915 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -308,7 +308,7 @@ in your initialization file (@pxref{Entering Emacs}). @opindex -Q @itemx --quick @opindex --quick -Start emacs with minimum customizations, similar to using @samp{-q}, +Start emacs with minimum customizations. This is similar to using @samp{-q}, @samp{--no-site-file}, @samp{--no-site-lisp}, and @samp{--no-splash} together. This also stops Emacs from processing X resources by setting @code{inhibit-x-resources} to @code{t} (@pxref{Resources}). diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index cfd45de6ac..bf2602f8f0 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1054,8 +1054,8 @@ pair with a colon and semicolon. The special variable/value pair @findex add-file-local-variable-prop-line @findex delete-file-local-variable-prop-line @findex copy-dir-locals-to-file-locals-prop-line - Instead of adding variable/value pairs by hand, you can use the -command @kbd{M-x add-file-local-variable-prop-line}. This prompts for + You can use the command @kbd{M-x add-file-local-variable-prop-line} +instead of adding entries by hand. It prompts for a variable and value, and adds them to the first line in the appropriate way. @kbd{M-x delete-file-local-variable-prop-line} prompts for a variable, and deletes its entry from the line. @kbd{M-x @@ -1522,7 +1522,7 @@ circumstances. @vindex minibuffer-local-completion-map @vindex minibuffer-local-must-match-map @vindex minibuffer-local-filename-completion-map -@vindex minibuffer-local-must-match-filename-map +@vindex minibuffer-local-filename-must-match-map The minibuffer has its own set of local keymaps; they contain various completion and exit commands. @@ -1539,7 +1539,7 @@ just like @key{RET}. for cautious completion. @item @code{minibuffer-local-filename-completion-map} and -@code{minibuffer-local-must-match-filename-map} are like the two +@code{minibuffer-local-filename-must-match-map} are like the two previous ones, but they are specifically for file name completion. They do not bind @key{SPC}. @end itemize diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index 84e81f565c..de5e8df9dc 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -260,14 +260,11 @@ placed from the top margin of the window; thus, as with These two variables are ignored if either @code{scroll-step} or @code{scroll-conservatively} are set to a non-zero value. - Note that @code{scroll-margin}, described below, limits the amount -of scrolling so as to put point outside of the top or bottom margin, -even if aggressive scrolling specifies a fraction @var{f} that is -larger than the window portion between the top and the bottom margins. - @vindex scroll-margin The variable @code{scroll-margin} restricts how close point can come -to the top or bottom of a window. Its value is a number of screen +to the top or bottom of a window (even if aggressive scrolling +specifies a fraction @var{f} that is larger than the window portion +between the top and the bottom margins). Its value is a number of screen lines; if point comes within that many lines of the top or bottom of the window, Emacs performs automatic scrolling. By default, @code{scroll-margin} is 0. diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 13f60e8cfd..9042f84e3b 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -3,12 +3,27 @@ @setfilename ../../info/emacs @settitle GNU Emacs Manual -@c The edition number appears in several places in this file +@c The edition number appears in more than one place in this file +@c I don't really know what it means... +@c For example, it has said "Sixteenth" since sometime in the Emacs 22 +@c series, all through 23, and into 24. So it is not very useful IMO, +@c and offers nothing that EMACSVER does not. I guess it relates +@c mainly to the published book sold by the FSF. Hence no longer +@c bother including it except iftex. Really, I think it should not be +@c here at all (since anyone can make a pdf version), but should just +@c be something added by the FSF during the publishing process. +@c Also, the lispref uses a float (3.0), whereas this uses an ordinal, +@c so the format is not even consistent. @set EDITION Sixteenth @include emacsver.texi @copying +@iftex This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* +@end iftex +@ifnottex +This is the @cite{GNU Emacs Manual}, +@end ifnottex updated for Emacs version @value{EMACSVER}. Copyright @copyright{} 1985-1987, 1993-2012 Free Software Foundation, Inc. diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index 9e9909e8bc..7b912ec972 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -666,8 +666,8 @@ The font slant---normally @samp{r} (roman), @samp{i} (italic), Some font names support other values. @item widthtype The font width---normally @samp{normal}, @samp{condensed}, -@samp{extended}, or @samp{semicondensed} (some font names support -other values). +@samp{semicondensed}, or @samp{extended}. Some font names support +other values. @item style An optional additional style name. Usually it is empty---most XLFDs have two hyphens in a row at this point. diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index 9d56b3bdc6..72583f25c8 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -893,7 +893,7 @@ Display the change history for the current repository (@code{vc-print-root-log}). @item C-x v I -Display the changes that will be received with a pull operation +Display the changes that a pull operation will retrieve (@code{vc-log-incoming}). @item C-x v O diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index b91763116b..ecbcda1ce8 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -2481,8 +2481,8 @@ find the one you select (@code{ffap-menu}). @findex animate-birthday-present @cindex animate - The @code{animate} package makes text dance. For an example, try -@kbd{M-x animate-birthday-present}. + The @code{animate} package makes text dance (e.g. try +@kbd{M-x animate-birthday-present}). @findex blackbox @findex mpuz diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi index 9c1d908f88..cffcb7573f 100644 --- a/doc/emacs/mule.texi +++ b/doc/emacs/mule.texi @@ -350,7 +350,7 @@ to the Emacs session. The supported language environments @cindex Euro sign @cindex UTF-8 @quotation -ASCII, Belarusian, Bengali, Brazilian Portuguese, Bulgarian, +ASCII, Belarusian, Bengali, Brazilian Portuguese, Bulgarian, Cham, Chinese-BIG5, Chinese-CNS, Chinese-EUC-TW, Chinese-GB, Chinese-GBK, Chinese-GB18030, Croatian, Cyrillic-ALT, Cyrillic-ISO, Cyrillic-KOI8, Czech, Devanagari, Dutch, English, Esperanto, Ethiopic, French, diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 9d30c6f4ca..152ac60584 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -456,7 +456,7 @@ apply to the lazy highlight, which always matches whole words. @cindex search for a regular expression A @dfn{regular expression} (or @dfn{regexp} for short) is a pattern -that denotes a class of alternative strings to match. GNU Emacs +that denotes a class of alternative strings to match. Emacs provides both incremental and nonincremental ways to search for a match for a regexp. The syntax of regular expressions is explained in the next section. diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi index 66281d6dbb..b99c98d84e 100644 --- a/doc/emacs/xresources.texi +++ b/doc/emacs/xresources.texi @@ -47,7 +47,7 @@ its own list of resources; to update it, use the command @command{xrdb}---for instance, @samp{xrdb ~/.Xdefaults}. @cindex registry, setting resources (MS-Windows) - (MS-Windows systems do not support X resource files; on Windows, + (MS-Windows systems do not support X resource files; on such systems, Emacs looks for X resources in the Windows Registry, first under the key @samp{HKEY_CURRENT_USER\SOFTWARE\GNU\Emacs}, which affects only the current user and override the system-wide settings, and then under diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index d9ebf07952..04b2803a4a 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2012-05-02 Glenn Morris <[email protected]> + + * emacs-lisp-intro.texi (Syntax): Reword to avoid underfull hbox. + 2012-04-14 Glenn Morris <[email protected]> * Makefile.in: Replace non-portable use of $< in ordinary rules. @@ -498,7 +502,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 6a9927b785..b2b3097814 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -1084,6 +1084,14 @@ Robert J. Chassell \fi @end tex +@c Note: this resetting of the page number back to 1 causes TeX to gripe +@c about already having seen page numbers 1-4 before (in the preface): +@c pdfTeX warning (ext4): destination with the same identifier (name{1}) +@c has been already used, duplicate ignored +@c I guess that is harmless (what happens if a later part of the text +@c makes a link to something in the first 4 pages though?). +@c Note that eg the Emacs manual has a preface, but does not bother +@c resetting the page numbers back to 1 after that. @iftex @headings off @evenheading @thispage @| @| @thischapter @@ -14855,7 +14863,7 @@ action would serve our purpose, except that a hyphen is merely the most common character within symbols that is not typically a word constituent character; there are others, too. -Alternatively, we can redefine the regular expression used in the +Alternatively, we can redefine the regexp used in the @code{@value{COUNT-WORDS}} definition so as to include symbols. This procedure has the merit of clarity, but the task is a little tricky. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 9c323d7937..dd439721f4 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,19 @@ +2012-05-02 Glenn Morris <[email protected]> + + * elisp.texi (@copying): + * intro.texi (Introduction): Only print VERSION in the TeX version. + +2012-05-02 Chong Yidong <[email protected]> + + * text.texi (Change Hooks): Minor fix for after-change-functions. + +2012-05-02 Glenn Morris <[email protected]> + + * package.texi (Packaging Basics): + * loading.texi (Autoload): + * files.texi (Magic File Names): + Reword to remove/reduce some overly long/short lines. + 2012-04-27 Glenn Morris <[email protected]> * elisp.texi, vol1.texi, vol2.texi: Some fixes for detailed menu. diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 9c5ae73f71..cbec93c4f6 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -6,6 +6,7 @@ @c Version of the manual and of Emacs. @c Please remember to update these in vol1.texi and vol2.texi as well. +@c (See comments for EDITION in emacs.texi) @set VERSION 3.1 @include emacsver.texi @set DATE July 2012 @@ -40,7 +41,12 @@ @c @syncodeindex tp fn @copying -This is edition @value{VERSION} of the GNU Emacs Lisp Reference Manual,@* +@iftex +This is edition @value{VERSION} of the @cite{GNU Emacs Lisp Reference Manual},@* +@end iftex +@ifnottex +This is the @cite{GNU Emacs Lisp Reference Manual} +@end ifnottex corresponding to Emacs version @value{EMACSVER}. Copyright @copyright{} 1990-1996, 1998-2012 Free Software Foundation, Inc. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 1af904aff4..1756e56bd2 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -2950,7 +2950,8 @@ between consecutive checks. For example: @example (defun display-time-file-nonempty-p (file) - (let ((remote-file-name-inhibit-cache (- display-time-interval 5))) + (let ((remote-file-name-inhibit-cache + (- display-time-interval 5))) (and (file-exists-p file) (< 0 (nth 7 (file-attributes (file-chase-links file))))))) @end example diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 37d2cc55a9..698bc8c125 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -33,8 +33,12 @@ Lisp that have counterparts in many programming languages, and later chapters describe features that are peculiar to Emacs Lisp or relate specifically to editing. - This is edition @value{VERSION} of the GNU Emacs Lisp Reference -Manual, corresponding to Emacs version @value{EMACSVER}. + This is +@iftex +edition @value{VERSION} of +@end iftex +the @cite{GNU Emacs Lisp Reference Manual}, +corresponding to Emacs version @value{EMACSVER}. @menu * Caveats:: Flaws and a request for help. diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 2bd500d847..7bd5f04d90 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -513,11 +513,10 @@ the following: @file{mode-local.el}). @item Definitions for major or minor modes: -@code{define-derived-mode}, @code{define-minor-mode}, -@code{define-compilation-mode}, @code{define-generic-mode}, -@code{easy-mmode-define-global-mode}, @code{define-global-minor-mode}, -@code{define-globalized-minor-mode}, and -@code{easy-mmode-define-minor-mode}. +@code{define-minor-mode}, @code{define-globalized-minor-mode}, +@code{define-generic-mode}, @code{easy-mmode-define-minor-mode}, +@code{easy-mmode-define-global-mode}, @code{define-compilation-mode}, +@code{define-derived-mode}, and @code{define-global-minor-mode}. @item Other definition types: @code{defcustom}, @code{defgroup}, @code{defclass} diff --git a/doc/lispref/package.texi b/doc/lispref/package.texi index 7cb260d32b..7c6d41b8e2 100644 --- a/doc/lispref/package.texi +++ b/doc/lispref/package.texi @@ -76,8 +76,8 @@ if any dependency cannot be found, the package cannot be installed. @end table @cindex content directory, package - Installing a package, either via the Package Menu, or via the -command @code{package-install-file}, creates a subdirectory of + Installing a package, either via the command @code{package-install-file}, +or via the Package Menu, creates a subdirectory of @code{package-user-dir} named @file{@var{name}-@var{version}}, where @var{name} is the package's name and @var{version} its version (e.g. @file{~/.emacs.d/elpa/auctex-11.86/}). We call this the diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index d794ddc385..1178c29489 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -4333,15 +4333,15 @@ buffer that is about to change is always the current buffer. @defvar after-change-functions This variable holds a list of functions to call after any buffer -modification. Each function receives three arguments: the beginning and -end of the region just changed, and the length of the text that existed -before the change. All three arguments are integers. The buffer that's -about to change is always the current buffer. - -The length of the old text is the difference between the buffer positions -before and after that text as it was before the change. As for the -changed text, its length is simply the difference between the first two -arguments. +modification. Each function receives three arguments: the beginning +and end of the region just changed, and the length of the text that +existed before the change. All three arguments are integers. The +buffer has been changed is always the current buffer. + +The length of the old text is the difference between the buffer +positions before and after that text as it was before the change. As +for the changed text, its length is simply the difference between the +first two arguments. @end defvar Output of messages into the @file{*Messages*} buffer does not diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 62841734d9..e8ebe45e8b 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,15 @@ +2012-05-02 Glenn Morris <[email protected]> + + * viper.texi: Make direntry shorter (also it is no longer "newest"). + + * emacs-gnutls.texi, ert.texi, org.texi: + Fix dircategory, direntry to match info/dir. + + * faq.texi: Convert @inforefs to @xrefs. + Fix some malformed cross-references. + (File-name conventions): Shorten section name to avoid overfull line. + (How to add fonts): Use smallexample to avoid overfull lines. + 2012-05-01 Teodor Zlatanov <[email protected]> * auth.texi (Help for users): Update for .gpg file being second. diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index 6002e678ff..b357b3d5e6 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -4,9 +4,9 @@ @settitle Emacs Lisp Regression Testing @c %**end of header -@dircategory Emacs +@dircategory Emacs misc features @direntry -* ERT: (ert). Emacs Lisp Regression Testing. +* ERT: (ert). Emacs Lisp regression testing tool. @end direntry @copying diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 34005bcb9a..9bb3feb52e 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi @@ -195,8 +195,7 @@ pressed.}. Also, on very few keyboards does @kbd{C-?} generate @acronym{ASCII} code 127. @c FIXME I cannot understand the previous sentence. -@inforef{Keys, Keys, emacs}, for more information. (@xref{Emacs -manual}, for more information about Info.) +@xref{Keys,,, emacs, The GNU Emacs Manual}. @node Extended commands @section What does @file{M-x @var{command}} mean? @@ -252,7 +251,7 @@ reference to follow it. Emacs manual. @node File-name conventions -@section What are @file{etc/GNU}, @file{src/config.h}, @file{site-lisp/default.el}, etc.? +@section What are @file{src/config.h}, @file{site-lisp/default.el}, etc.? @cindex File-name conventions @cindex Conventions for file names @cindex Directories and files that come with Emacs @@ -1338,7 +1337,7 @@ of files from Macintosh, Microsoft, and Unix platforms. @cindex Init file, setting up @cindex Customization file, setting up -@inforef{Init File, Init File, emacs}. +@xref{Init File,,, emacs, The GNU Emacs Manual}. In general, new Emacs users should not be provided with @file{.emacs} files, because this can cause confusing non-standard behavior. Then @@ -1353,8 +1352,8 @@ rather than Lisp code. While Customize might indeed make it easier to configure Emacs, consider taking a bit of time to learn Emacs Lisp and modifying your @file{.emacs} directly. Simple configuration options are described -rather completely in @inforef{Init File, Init File, emacs}, for users -interested in performing frequently requested, basic tasks. +rather completely in @ref{Init File,,, emacs, The GNU Emacs Manual}, +for users interested in performing frequently requested, basic tasks. Sometimes users are unsure as to where their @file{.emacs} file should be found. Visiting the file as @file{~/.emacs} from Emacs will find @@ -1370,7 +1369,7 @@ The main Customize entry point is @kbd{M-x customize @key{RET}}. This command takes you to a buffer listing all the available Customize groups. From there, you can access all customizable options and faces, change their values, and save your changes to your init file. -@inforef{Easy Customization, Easy Customization, emacs}. +@xref{Easy Customization,,, emacs, The GNU Emacs Manual}. If you know the name of the group in advance (e.g. ``shell''), use @kbd{M-x customize-group @key{RET}}. @@ -1675,16 +1674,16 @@ M-x replace-regexp @key{RET} [^ @key{TAB} C-q @key{LFD} C-q @key{RET} C-q C-l @k @cindex Searching for newlines @cindex Replacing newlines -Use @kbd{C-q C-j}. For more information, see @inforef{Special Isearch, -Special Input for Incremental Search, emacs}. - +Use @kbd{C-q C-j}. For more information, +@pxref{Special Isearch,, Special Input for Incremental Search, emacs, +The GNU Emacs Manual}. @node Yanking text in isearch @section How do I copy text from the kill ring into the search string? @cindex Yanking text into the search string @cindex isearch yanking -Use @kbd{M-y}. @inforef{Isearch Yank, Isearch Yanking, emacs}. +Use @kbd{M-y}. @xref{Isearch Yank,,, emacs, The GNU Emacs Manual}. @node Wrapping words automatically @section How do I make Emacs wrap words for me? @@ -2133,7 +2132,7 @@ commands you've typed. To repeat a set of commands, use keyboard macros. Use @kbd{C-x (} and @kbd{C-x )} to make a keyboard macro that invokes the command and then -type @kbd{C-x e}. (@inforef{Keyboard Macros, Keyboard Macros, emacs}.) +type @kbd{C-x e}. @xref{Keyboard Macros,,, emacs, The GNU Emacs Manual}. If you're really desperate for the @code{.} command in @code{vi} that redoes the last insertion/deletion, use VIPER, a @code{vi} emulation @@ -2145,7 +2144,7 @@ mode which comes with Emacs, and which appears to support it. @cindex X resources @cindex Setting X resources -@inforef{X Resources, X Resources, emacs}. +@xref{X Resources,,, emacs, The GNU Emacs Manual}. You can also use a resource editor, such as editres (for X11R5 and onwards), to look at the resource names for the menu bar, assuming Emacs @@ -2256,7 +2255,7 @@ See also the variable @code{track-eol} and the command @cindex Suspending Emacs @kbd{C-z} iconifies Emacs when running under X and suspends Emacs -otherwise. @inforef{Frame Commands, Frame Commands, emacs}. +otherwise. @xref{Frame Commands,,, emacs, The GNU Emacs Manual}. @node Using regular expressions @section How do I use regexps (regular expressions) in Emacs? @@ -2266,7 +2265,7 @@ otherwise. @inforef{Frame Commands, Frame Commands, emacs}. @cindex Unix regexps, differences from Emacs @cindex Text strings, putting regexps in -@inforef{Regexp Backslash, Regexp Backslash, emacs}. +@xref{Regexp Backslash,,, emacs, The GNU Emacs Manual}. The @code{or} operator is @samp{\|}, not @samp{|}, and the grouping operators are @samp{\(} and @samp{\)}. Also, the string syntax for a backslash is @@ -2323,7 +2322,7 @@ To accept all replacements in each file, hit @kbd{!}. Another way to do the same thing is to use the ``tags'' feature of Emacs: it includes the command @code{tags-query-replace} which performs a query-replace across all the files mentioned in the @file{TAGS} file. -@inforef{Tags Search, Tags Search, emacs}. +@xref{Tags Search,,, emacs, The GNU Emacs Manual}. @node Documentation for etags @section Where is the documentation for @code{etags}? @@ -2366,8 +2365,8 @@ the Unix shell, try GNU @code{ls} with the @samp{-B} option. GNU @code{ls} is part of the GNU Fileutils package, available from @samp{ftp.gnu.org} and its mirrors (@pxref{Current GNU distributions}). -To disable or change the way backups are made, @inforef{Backup Names, , -emacs}. +To disable or change the way backups are made, +@pxref{Backup Names,,, emacs, The GNU Emacs Manual}. @cindex Backup files in a single directory Beginning with Emacs 21.1, you can control where Emacs puts backup files @@ -2397,8 +2396,8 @@ package (@pxref{Packages that do not come with Emacs}). This package also allows you to place all auto-save files in one directory, such as @file{/tmp}. -To disable or change how @code{auto-save-mode} works, @inforef{Auto -Save, , emacs}. +To disable or change how @code{auto-save-mode} works, +@pxref{Auto Save,,, emacs, The GNU Emacs Manual}. @node Going to a line by number @section How can I go to a certain line given its number? @@ -2621,7 +2620,7 @@ consult the documentation of the variables @code{ps-printer-name}, Customize the @code{scroll-conservatively} variable with @kbd{M-x customize-variable @key{RET} scroll-conservatively @key{RET}} and set it to a large value like, say, 10000. For an explanation of what this -means, @inforef{Auto Scrolling, Auto Scrolling, emacs}. +means, @pxref{Auto Scrolling,,, emacs, The GNU Emacs Manual}. Alternatively, use the following Lisp form in your @file{.emacs}: @@ -2692,8 +2691,8 @@ put the following in your @file{.emacs} file: To avoid the slightly distracting visual effect of Emacs starting with its default frame size and then growing to fullscreen, you can add an -@samp{Emacs.Geometry} entry to the Windows registry settings (see -@pxref{(emacs)X Resources}). +@samp{Emacs.Geometry} entry to the Windows registry settings. +@xref{X Resources,,, emacs, The GNU Emacs Manual}. To compute the correct values for width and height, first maximize the Emacs frame and then evaluate @code{(frame-height)} and @@ -3058,7 +3057,7 @@ You can also tell Emacs whether to allow the evaluation of Emacs Lisp code found at the bottom of files by setting the variable @code{enable-local-eval}. -For more information, @inforef{File Variables, File Variables, emacs}. +@xref{File Variables,,, emacs, The GNU Emacs Manual}. @item Synthetic X events. (Yes, a risk; use @samp{MIT-MAGIC-COOKIE-1} or @@ -3501,7 +3500,7 @@ Keys can be bound to commands either interactively or in your To bind a key just in the current major mode, type @kbd{M-x local-set-key @key{RET} @var{key} @var{cmd} @key{RET}}. -@inforef{Key Bindings, Key Bindings, emacs}, for further details. +@xref{Key Bindings,,, emacs, The GNU Emacs Manual}. To make the process of binding keys interactively easier, use the following ``trick'': First bind the key interactively, then immediately @@ -3766,8 +3765,8 @@ keymaps. However, in the specific case of @kbd{C-h} and @key{DEL}, you should toggle @code{normal-erase-is-backspace-mode} instead of calling -@code{keyboard-translate}. @inforef{DEL Does Not Delete, DEL Does Not Delete, -emacs}. +@code{keyboard-translate}. +@xref{DEL Does Not Delete,,, emacs, The GNU Emacs Manual}. Keyboard translations are not the same as key bindings in keymaps. Emacs contains numerous keymaps that apply in different situations, but @@ -3895,7 +3894,7 @@ terminals. Non-@acronym{ASCII} keys and mouse events (e.g. @kbd{C-=} and @cindex @key{Meta} key and @code{xterm} @cindex Xterm and @key{Meta} key -@inforef{Unibyte Mode, Single-Byte Character Set Support, emacs}. +@xref{Unibyte Mode,, Single-Byte Character Set Support, emacs, The GNU Emacs Manual}. If the advice in the Emacs manual fails, try all of these methods before asking for further help: @@ -4019,8 +4018,8 @@ You can get the old behavior by binding @kbd{SPC} to @cindex Displaying eight-bit characters @cindex Eight-bit characters, displaying -@inforef{Unibyte Mode, Single-byte Character Set -Support, emacs}. On a Unix, when Emacs runs on a text-only terminal +@xref{Unibyte Mode,, Single-byte Character Set Support, emacs, The GNU +Emacs Manual}. On a Unix, when Emacs runs on a text-only terminal display or is invoked with @samp{emacs -nw}, you typically need to use @code{set-terminal-coding-system} to tell Emacs what the terminal can display, even after setting the language environment; otherwise @@ -4035,10 +4034,10 @@ terminal coding system automatically. @cindex Eight-bit characters, entering @cindex Input, 8-bit characters -Various methods are available for input of eight-bit characters. See -@inforef{Unibyte Mode, Single-byte Character Set -Support, emacs}. For more sophisticated methods, @inforef{Input -Methods, Input Methods, emacs}. +Various methods are available for input of eight-bit characters. +@xref{Unibyte Mode,, Single-byte Character Set Support, emacs, The GNU +Emacs Manual}. For more sophisticated methods, +@pxref{Input Methods,,, emacs, The GNU Emacs Manual}. @node Right-to-left alphabets @section Where is an Emacs that can handle Semitic (right-to-left) alphabets? @@ -4133,7 +4132,7 @@ set up @code{w32-bdf-filename-alist}: Now, create fontsets for the BDF fonts: -@lisp +@smallexample (create-fontset-from-fontset-spec "-*-fixed-medium-r-normal-*-16-*-*-*-c-*-fontset-bdf, japanese-jisx0208:-*-*-medium-r-normal-*-16-*-*-*-c-*-jisx0208.1983-*, @@ -4145,7 +4144,7 @@ Now, create fontsets for the BDF fonts: tibetan-1-column:-TibMdXA-fixed-medium-r-normal--16-160-72-72-m-80-MuleTibetan-1, ethiopic:-Admas-Ethiomx16f-Medium-R-Normal--16-150-100-100-M-160-Ethiopic-Unicode, tibetan:-TibMdXA-fixed-medium-r-normal--16-160-72-72-m-160-MuleTibetan-0") -@end lisp +@end smallexample Many of the international bdf fonts from Intlfonts are type 0, and therefore need to be added to font-encoding-alist: @@ -4377,7 +4376,7 @@ you to start Emacs quickly when you needed to. Use @kbd{M-x gnus}. For more information on Gnus, @pxref{Top,, the Gnus Manual, gnus, The Gnus Manual}, which includes @ref{Frequently Asked -Questions,, the Gnus FAQ, gnus}. +Questions,, the Gnus FAQ, gnus, The Gnus Manual}. @node Gnus does not work with NNTP diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 67633e1aca..775ff638ee 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -286,7 +286,7 @@ license to the document, as described in section 6 of the license. @end quotation @end copying -@dircategory Emacs +@dircategory Emacs editing modes @direntry * Org Mode: (org). Outline-based notes management and organizer @end direntry diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index 86455524b1..94f7e53ce8 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -25,9 +25,7 @@ developing GNU and promoting software freedom.'' @dircategory Emacs misc features @direntry -* VIPER: (viper). The newest Emacs VI-emulation mode. - (also, A VI Plan for Emacs Rescue - or the VI PERil.) +* VIPER: (viper). A VI-emulation mode for Emacs. @end direntry @finalout diff --git a/etc/refcards/calccard.pdf b/etc/refcards/calccard.pdf Binary files differindex 58b203672d..5e97c2a9d9 100644 --- a/etc/refcards/calccard.pdf +++ b/etc/refcards/calccard.pdf diff --git a/etc/refcards/cs-dired-ref.pdf b/etc/refcards/cs-dired-ref.pdf Binary files differindex cf16c1afd1..1b5a8612ed 100644 --- a/etc/refcards/cs-dired-ref.pdf +++ b/etc/refcards/cs-dired-ref.pdf diff --git a/etc/refcards/cs-refcard.pdf b/etc/refcards/cs-refcard.pdf Binary files differindex 7d0f92fa40..963adcc7bb 100644 --- a/etc/refcards/cs-refcard.pdf +++ b/etc/refcards/cs-refcard.pdf diff --git a/etc/refcards/de-refcard.pdf b/etc/refcards/de-refcard.pdf Binary files differindex c7a619b048..bccc60993f 100644 --- a/etc/refcards/de-refcard.pdf +++ b/etc/refcards/de-refcard.pdf diff --git a/etc/refcards/dired-ref.pdf b/etc/refcards/dired-ref.pdf Binary files differindex 18a02e28ae..0f57967080 100644 --- a/etc/refcards/dired-ref.pdf +++ b/etc/refcards/dired-ref.pdf diff --git a/etc/refcards/fr-dired-ref.pdf b/etc/refcards/fr-dired-ref.pdf Binary files differindex 1bd84b84e7..32f12ab208 100644 --- a/etc/refcards/fr-dired-ref.pdf +++ b/etc/refcards/fr-dired-ref.pdf diff --git a/etc/refcards/fr-refcard.pdf b/etc/refcards/fr-refcard.pdf Binary files differindex 91f4fafe2d..020ffbdeea 100644 --- a/etc/refcards/fr-refcard.pdf +++ b/etc/refcards/fr-refcard.pdf diff --git a/etc/refcards/gnus-booklet.pdf b/etc/refcards/gnus-booklet.pdf Binary files differindex f39af86039..6c8fa37623 100644 --- a/etc/refcards/gnus-booklet.pdf +++ b/etc/refcards/gnus-booklet.pdf diff --git a/etc/refcards/gnus-refcard.pdf b/etc/refcards/gnus-refcard.pdf Binary files differindex 016f8fd705..c64ed30f39 100644 --- a/etc/refcards/gnus-refcard.pdf +++ b/etc/refcards/gnus-refcard.pdf diff --git a/etc/refcards/pl-refcard.pdf b/etc/refcards/pl-refcard.pdf Binary files differindex 47299efa1b..ddeeca97da 100644 --- a/etc/refcards/pl-refcard.pdf +++ b/etc/refcards/pl-refcard.pdf diff --git a/etc/refcards/pt-br-refcard.pdf b/etc/refcards/pt-br-refcard.pdf Binary files differindex dff1c3f6c0..dc61712a99 100644 --- a/etc/refcards/pt-br-refcard.pdf +++ b/etc/refcards/pt-br-refcard.pdf diff --git a/etc/refcards/refcard.pdf b/etc/refcards/refcard.pdf Binary files differindex f6c47d8a5f..f2a720d656 100644 --- a/etc/refcards/refcard.pdf +++ b/etc/refcards/refcard.pdf diff --git a/etc/refcards/ru-refcard.pdf b/etc/refcards/ru-refcard.pdf Binary files differindex 3bdc7895a9..2289acff75 100644 --- a/etc/refcards/ru-refcard.pdf +++ b/etc/refcards/ru-refcard.pdf diff --git a/etc/refcards/sk-dired-ref.pdf b/etc/refcards/sk-dired-ref.pdf Binary files differindex e14764bd8f..2cd9ef12fd 100644 --- a/etc/refcards/sk-dired-ref.pdf +++ b/etc/refcards/sk-dired-ref.pdf diff --git a/etc/refcards/sk-refcard.pdf b/etc/refcards/sk-refcard.pdf Binary files differindex d0a34927a2..e02c7db3d4 100644 --- a/etc/refcards/sk-refcard.pdf +++ b/etc/refcards/sk-refcard.pdf @@ -19,6 +19,7 @@ The Info Directory * Menu: +Texinfo documentation system * Info: (info). How to use the documentation browsing system. Emacs @@ -54,7 +55,7 @@ Emacs network features you're replying to, in flexible ways. * Sieve: (sieve). Managing Sieve scripts in Emacs. * TRAMP: (tramp). Transparent Remote Access, Multiple Protocol - GNU Emacs remote file access via rsh and rcp. + Emacs remote file access via rsh and rcp. Emacs misc features * Autotype: (autotype). Convenient features for text that you enter @@ -67,7 +68,7 @@ Emacs misc features * Ediff: (ediff). A visual interface for comparing and merging programs. * EDT: (edt). An Emacs emulation of the EDT editor. -* EIEIO: (eieio). An object system for Emacs Lisp. +* EIEIO: (eieio). An objects system for Emacs Lisp. * ERT: (ert). Emacs Lisp regression testing tool. * Eshell: (eshell). A command shell implemented in Emacs Lisp. * Flymake: (flymake). A universal on-the-fly syntax checker. @@ -77,18 +78,15 @@ Emacs misc features * RefTeX: (reftex). Emacs support for LaTeX cross-references and citations. * Remember: (remember). Simple information manager for Emacs. -* Semantic: (semantic). Source code parsing utilities for Emacs. -* SES: (ses). Simple Emacs Spreadsheet +* Semantic: (semantic). Source code parser library and utilities. +* SES: (ses). Simple Emacs Spreadsheet. * Speedbar: (speedbar). File/Tag summarizing utility. * VIP: (vip). An older VI-emulation for Emacs. -* VIPER: (viper). The newest Emacs VI-emulation mode. - (also, A VI Plan for Emacs Rescue - or the VI PERil.) +* VIPER: (viper). A VI-emulation mode for Emacs. * WoMan: (woman). Browse UN*X Manual Pages "W.O. (without) Man". Emacs lisp libraries -* Auth-source: (auth). A single configuration for multiple - applications. +* Auth-source: (auth). The Emacs auth-source library. * CL: (cl). Partial Common Lisp support for Emacs Lisp. * D-Bus: (dbus). Using D-Bus in Emacs. * Emacs MIME: (emacs-mime). Emacs MIME de/composition library. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07505a3253..e144bf1507 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,18 @@ +2012-05-02 Eli Zaretskii <[email protected]> + + * mail/rmail.el (rmail-yank-current-message): Use the encoding of + the yanked message in preference to the default value of + buffer-file-coding-system. + +2012-05-02 Martin Rudalics <[email protected]> + + * window.el (display-buffer--action-function-custom-type): Fix + entry. + +2012-05-02 Alan Mackenzie <[email protected]> + + * progmodes/cc-defs.el (c-version): Update to 5.32.3. + 2012-05-01 Glenn Morris <[email protected]> * cus-start.el (suggest-key-bindings): Remove, now it is in Lisp. diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index d2b9890805..8deb938298 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -3570,8 +3570,17 @@ If BUFFER is not swapped, yank out of its message viewer buffer." (with-current-buffer buffer (unless (rmail-buffers-swapped-p) (setq buffer rmail-view-buffer))) - (insert-buffer buffer)) - + (insert-buffer buffer) + ;; If they yank the text of BUFFER, the encoding of BUFFER is a + ;; better default for the reply message than the default value of + ;; buffer-file-coding-system. + (and (coding-system-equal (default-value 'buffer-file-coding-system) + buffer-file-coding-system) + (setq buffer-file-coding-system + (coding-system-change-text-conversion + buffer-file-coding-system (coding-system-base + (with-current-buffer buffer + buffer-file-coding-system)))))) (defun rmail-start-mail (&optional noerase to subject in-reply-to cc replybuffer sendactions same-window diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 93a7279656..5d758b53b5 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -93,7 +93,7 @@ ;;; Variables also used at compile time. -(defconst c-version "5.32.2" +(defconst c-version "5.32.3" "CC Mode version number.") (defconst c-version-sym (intern c-version)) diff --git a/lisp/window.el b/lisp/window.el index d57bd4e230..9557dbf057 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -4611,7 +4611,7 @@ The actual non-nil value of this variable will be copied to the '(choice :tag "Function" (const :tag "--" ignore) ; default for insertion (const display-buffer-reuse-window) - (const display-buffer-use-some-window) + (const display-buffer-pop-up-window) (const display-buffer-same-window) (const display-buffer-pop-up-frame) (const display-buffer-use-some-window) diff --git a/src/ChangeLog b/src/ChangeLog index f624517efb..fb5cab2ac3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2012-05-02 Eli Zaretskii <[email protected]> + + * xdisp.c (pos_visible_p): If already at a newline from the + display string before the 'while' loop, don't walk back the glyphs + from it3.glyph_row. Solves assertion violation when the display + string begins with a newline (egg.el). (Bug#11367) + 2012-05-01 Stefan Monnier <[email protected]> * keyboard.c (Fexecute_extended_command, Vsuggest_key_bindings): diff --git a/src/xdisp.c b/src/xdisp.c index 307331627f..da44281a55 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1385,6 +1385,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, Lisp_Object startpos, endpos; EMACS_INT start, end; struct it it3; + int it3_moved; /* Find the first and the last buffer positions covered by the display string. */ @@ -1441,6 +1442,15 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, begins. */ start_display (&it3, w, top); move_it_to (&it3, -1, 0, top_y, -1, MOVE_TO_X | MOVE_TO_Y); + /* If it3_moved stays zero after the 'while' loop + below, that means we already were at a newline + before the loop (e.g., the display string begins + with a newline), so we don't need to (and cannot) + inspect the glyphs of it3.glyph_row, because + PRODUCE_GLYPHS will not produce anything for a + newline, and thus it3.glyph_row stays at its + stale content it got at top of the window. */ + it3_moved = 0; /* Finally, advance the iterator until we hit the first display element whose character position is CHARPOS, or until the first newline from the @@ -1452,6 +1462,7 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, if (IT_CHARPOS (it3) == charpos || ITERATOR_AT_END_OF_LINE_P (&it3)) break; + it3_moved = 1; set_iterator_to_next (&it3, 0); } top_x = it3.current_x - it3.pixel_width; @@ -1462,7 +1473,8 @@ pos_visible_p (struct window *w, EMACS_INT charpos, int *x, int *y, display string, move back over the glyphs produced from the string, until we find the rightmost glyph not from the string. */ - if (IT_CHARPOS (it3) != charpos && EQ (it3.object, string)) + if (it3_moved + && IT_CHARPOS (it3) != charpos && EQ (it3.object, string)) { struct glyph *g = it3.glyph_row->glyphs[TEXT_AREA] + it3.glyph_row->used[TEXT_AREA]; |