diff options
594 files changed, 5815 insertions, 4776 deletions
diff --git a/ChangeLog b/ChangeLog index 3d8f5758afa..34039b3860c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-11-13 Glenn Morris <rgm@gnu.org> + + * INSTALL: Tiny updates for disk space used during installation. + +2011-11-05 Eli Zaretskii <eliz@gnu.org> + + * lib/makefile.w32-in (FRC): New dummy target. + (TAGS): Depend on FRC. + +2011-11-04 Glenn Morris <rgm@gnu.org> + + * configure.in: Increase minimum GnuTLS version to 2.6.6. (Bug#9929) + Do not include GnuTLS version info in final summary message. + 2011-10-31 Eli Zaretskii <eliz@gnu.org> * config.bat: Use config.in and Makefile.in from src/ and lib/, if @@ -2379,7 +2393,7 @@ * BUGS: Use new binding of view-emacs-problems. -2009-05-04 Simon Leinen <simon.leinen@switch.ch> (tiny change) +2009-05-04 Simon Leinen <simon.leinen@switch.ch> (tiny change) * Makefile.in (install-arch-dep): Avoid using $$(..) construct, for Solaris compatibility. @@ -31,9 +31,9 @@ some of the steps manually. The more detailed description in the other sections of this guide will help you do that, so please refer to those sections if you need to. - 1. Unpacking the Emacs 23.2 release requires about 170 MB of free - disk space. Building Emacs uses about another 60 MB of space. - The final installed Emacs uses about 120 MB of disk space. + 1. Unpacking the Emacs 24.1 release requires about 180 MB of free + disk space. Building Emacs uses about another 70 MB of space. + The final installed Emacs uses about 110 MB of disk space. This includes the space-saving that comes from automatically compressing the Lisp source files on installation. diff --git a/admin/ChangeLog b/admin/ChangeLog index f91d53194ce..6030dd8f6d3 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,19 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * admin.el (manual-dvi): Fix typo. + +2011-11-15 Eli Zaretskii <eliz@gnu.org> + + * nt/README-ftp-server: Update the information about PNG libraries. + +2011-11-15 Juanma Barranquero <lekktu@gmail.com> + + * make-emacs: Fix typo. + +2011-11-07 Juanma Barranquero <lekktu@gmail.com> + + * unidata/makefile.w32-in (clean): Remove bidimirror.h and biditype.h. + 2011-10-31 David Engster <deng@randomsample.de> * grammars/bovine-grammar.el: Avoid using old-style backquotes. diff --git a/admin/README b/admin/README index 4dd1705fe74..10a8f2244fc 100644 --- a/admin/README +++ b/admin/README @@ -18,7 +18,7 @@ Living list of activities that must be completed before the next release. ** make-tarball.txt -Instructions to create pretest or release tarballs, annoucements, etc. +Instructions to create pretest or release tarballs, announcements, etc. ** admin.el @@ -88,4 +88,3 @@ Local variables: mode: outline paragraph-separate: "[ ]*$" end: - diff --git a/admin/admin.el b/admin/admin.el index 673d86c8825..9235144f6c6 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -330,7 +330,7 @@ the @import directive." (defun manual-dvi (texi-file dest ps-dest) "Run texi2dvi on TEXI-FILE, emitting dvi output to DEST. -Also generate postscript output in PS-DEST." +Also generate PostScript output in PS-DEST." (call-process "texi2dvi" nil nil nil texi-file "-o" dest) (call-process "dvips" nil nil nil dest "-o" ps-dest) (call-process "gzip" nil nil nil dest) diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c index e09ddd62b97..b3ea8af9d70 100644 --- a/admin/alloc-colors.c +++ b/admin/alloc-colors.c @@ -40,7 +40,7 @@ void usage (const char *progname) { fprintf (stderr, "Usage %s options\n", progname); - fprintf (stderr, "-n NCOLORS allcoate NCOLORS colors\n"); + fprintf (stderr, "-n NCOLORS allocate NCOLORS colors\n"); exit (1); } @@ -111,4 +111,3 @@ main (int argc, char **argv) XCloseDisplay (dpy); return 0; } - diff --git a/admin/charsets/cp51932.awk b/admin/charsets/cp51932.awk index 39ccc1c7dc1..b611def710d 100644 --- a/admin/charsets/cp51932.awk +++ b/admin/charsets/cp51932.awk @@ -20,7 +20,7 @@ # Commentary: -# Genereate a translation table for CP51932 (EUC-JP of MicroSoft Version). +# Generate a translation table for CP51932 (EUC-JP of MicroSoft Version). # It maps invalid JISX0208 code points used by CP51932 to Unicode. # 4th field of the input has these meanings: # 0: JISX0208 characters. diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index c1804af98cd..e87d548cf31 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README @@ -6,7 +6,7 @@ See the end of the file for license conditions. The charset map files directory -This directory contains two kinds of charse map files; verbatim copies +This directory contains two kinds of charset map files; verbatim copies (or their compressed versions) of files freely available in the Internet, and newly created files based on freely available information. diff --git a/admin/charsets/mapfiles/Uni2JIS b/admin/charsets/mapfiles/Uni2JIS index 59e3a1e1dfa..e3c8a25db17 100644 --- a/admin/charsets/mapfiles/Uni2JIS +++ b/admin/charsets/mapfiles/Uni2JIS @@ -26,7 +26,7 @@ # where XXXX is the code point. Including all these # names in this file increases its size substantially # and needlessly. The token "<CJK>" is used for the -# name of these chracters. If necessary, it can be +# name of these characters. If necessary, it can be # expanded algorithmically by a parser or editor. # # The entries are in Unicode order. @@ -514,7 +514,7 @@ 045A S-0790 # CYRILLIC SMALL LETTER NJE 045B S-0791 # CYRILLIC SMALL LETTER TSHE (Serbocroatian) 045C S-0792 # CYRILLIC SMALL LETTER KJE -045E S-0793 # CYRILLIC SMALL LETTER SHORT U (Byalorussian) +045E S-0793 # CYRILLIC SMALL LETTER SHORT U (Byelorussian) 045F S-0794 # CYRILLIC SMALL LETTER DZHE 2010 0-0130 1-0130 2-0130 # HYPHEN 2014 0-0129 1-0129 2-0129 # EM DASH diff --git a/admin/grammars/c.by b/admin/grammars/c.by index 1797827679b..004f0b5f30f 100644 --- a/admin/grammars/c.by +++ b/admin/grammars/c.by @@ -566,7 +566,7 @@ template-type (TYPE-TAG $2 "class" nil nil ) | STRUCT symbol (TYPE-TAG $2 "struct" nil nil ) - ;; TODO: Klaus Berndl: For the moment is is ok, that we parse the C++ + ;; TODO: Klaus Berndl: For the moment it is ok, that we parse the C++ ;; keyword typename as a class.... | TYPENAME symbol (TYPE-TAG $2 "class" nil nil) @@ -734,7 +734,7 @@ builtintype ;; Klaus Berndl: This parses also nonsense like "const volatile int ;; const volatile const const volatile a ..." but IMHO nobody writes -;; such code. Normaly we shoud define a rule like typeformbase-mode +;; such code. Normally we should define a rule like typeformbase-mode ;; which exactly defines the different allowed cases and combinations ;; of declmods (minus the CVDECLMOD) typeformbase and cv-declmods so ;; we could recognize more invalid code but IMHO this is not worth the @@ -1105,7 +1105,7 @@ fun-or-proto-end ( t ) | semantic-list ( nil ) - ;; Here is an anoying feature of C++ pure virtual methods + ;; Here is an annoying feature of C++ pure virtual methods | EQUAL ZERO SEMICOLON ( :pure-virtual-flag ) | fun-try-end diff --git a/admin/grammars/python.wy b/admin/grammars/python.wy index a0af813e5e8..b30305ee78a 100644 --- a/admin/grammars/python.wy +++ b/admin/grammars/python.wy @@ -828,7 +828,7 @@ paren_classes ; ;; In general, the base class can be specified by a general expression -;; which evalue to a class object, i.e., base classes are not just names! +;; which evaluates to a class object, i.e., base classes are not just names! ;; However base classes are names in most cases. Thus the ;; non-terminals below work only with simple names. Even if the ;; parser can parse general expressions, I don't see much benefit in diff --git a/admin/make-emacs b/admin/make-emacs index b21dcad5f37..d231f66b03b 100755 --- a/admin/make-emacs +++ b/admin/make-emacs @@ -72,7 +72,7 @@ Build Emacs. --gprof make Emacs for profiling --union-type define USE_LISP_UNION_TYPE (bad for GDB) --malloc-check define GC_MALLOC_CHECK - --no-mcheck dont define GC_MCHECK + --no-mcheck don't define GC_MCHECK --wall compile with -Wall --gcc3 use GCC 3.0 (30% slower compilation, slower code) --trace-selection print traces in xselect.c diff --git a/admin/notes/bzr b/admin/notes/bzr index 12a3b194266..50eaf3710ee 100644 --- a/admin/notes/bzr +++ b/admin/notes/bzr @@ -173,7 +173,7 @@ This restores file, but without its history (`bzr log file' will be very short). This is because file gets re-added with a new file-id (use `bzr file-id file' to see the id). -Insteading of adding the file, try: +Instead of adding the file, try: bzr revert -rN file; bzr commit diff --git a/admin/notes/commits b/admin/notes/commits index f37c3e020be..2c6f80c56f0 100644 --- a/admin/notes/commits +++ b/admin/notes/commits @@ -17,7 +17,7 @@ Date: Tue, 31 Mar 2009 12:21:20 +0900 files), not one-by-one. This is pretty easy using vc-dir now. (2) Make the log message describe the entire changeset, perhaps - including relevant changelog entiries (I often don't bother with + including relevant changelog entries (I often don't bother with the latter if it's a trivial sort of change). Many modern source-control systems vaguely distinguish the first diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty index 85babb903b9..410e3aa8614 100644 --- a/admin/notes/multi-tty +++ b/admin/notes/multi-tty @@ -160,7 +160,7 @@ I use the following two bash scripts to handle my Emacs sessions: name="$1" shift - + if [ -z "$name" ]; then echo "Usage: connect_emacs <name> <args>..." >&2 exit 1 @@ -184,7 +184,7 @@ screendir="/var/run/screen/S-$USER" serverdir="/tmp/emacs$UID" emacs=/usr/bin/emacs-multi-tty # Or wherever you installed your multi-tty Emacs -if [ -z "$name" ]; then +if [ -z "$name" ]; then echo "Usage: preload_emacs <name> [<waitp>]" >&2 exit 1 fi @@ -314,7 +314,7 @@ THINGS TO DO Emacs with GTK support. If you want to play around with GTK multidisplay (and don't mind core dumps), you can edit src/config.h and define HAVE_GTK_MULTIDISPLAY there by hand. - + http://bugzilla.gnome.org/show_bug.cgi?id=85715 Update: Han reports that GTK+ version 2.8.9 almost gets display @@ -414,7 +414,7 @@ THINGS TO DO sometimes; Emacs does not respond to stimuli from other keyboards. At least a beep or a message would be important, if the single-mode is still required to prevent interference. (Reported by Dan - Nicolaescu.) + Nicolaescu.) Update: selecting a region with the mouse enables single_kboard under X. This is very confusing. @@ -542,7 +542,7 @@ THINGS TO DO are not useful; before starting work on DOS support, revert to pristine, pre-multi-tty versions. -** Fix Windows support. Currently bootstraping works on w32, but Emacs +** Fix Windows support. Currently bootstrapping works on w32, but Emacs crashes on startup and none of the multi-tty features are implemented. Many XXX comments mark things that probably need updating, ChangeLogs will help in spotting changes to X specific @@ -1026,7 +1026,7 @@ DIARY OF CHANGES settings as Emacs itself. This may lead to bogus results in a multi-locale setup. (E.g., while logging in from a remote client with a different locale.) - (Update after new bugreport by Friedrich Delgado Friedrichs: + (Update after new bugreport by Friedrich Delgado Friedrichs: (at least) the structs terminal_coding and keyboard_coding in coding.c must be moved to struct display, and the Lisp interface [set-]keyboard-coding-system must be adapted for the change.) @@ -1088,7 +1088,7 @@ DIARY OF CHANGES -- Miles Bader suggests that C-x C-c on an emacsclient frame should only close the frame, not exit the entire Emacs session. Update: see above for a function that does this. Maybe this should be the - new default? + new default? (Done. This is the new default. No complaints so far.) @@ -1131,7 +1131,7 @@ DIARY OF CHANGES from exiting Emacs. (Reported by Mnemonikk on freenode.) (Done, I hope.) - + -- Having {reset,init}_all_sys_modes in set-input-mode breaks arrow keys on non-selected terminals under screen, and sometimes on other @@ -1157,7 +1157,7 @@ DIARY OF CHANGES > Cursor mode. Applications have to send the smkx and rmkx terminfo > strings to switch between the 2 modes. So Emacs (and emacsclient) have > to send smkx when initializing and rmkx when quitting (or on - > suspend). + > suspend). (I think patch-370 fixed this.) @@ -1166,7 +1166,7 @@ DIARY OF CHANGES emacs M-x server-start - + # From another xterm: emacsclient -e '(y-or-n-p "Do you want me to crash? ")' # Notice how the answer ends up in the *scratch* buffer @@ -1205,7 +1205,7 @@ DIARY OF CHANGES it is not recognized correctly. May be related to the bug below. (Seems to have been fixed as a side effect of patch-434. "The bug - below" was the set-input-mode madness.) + below" was the set-input-mode madness.) (Update: this bug was fixed for good in patch-449. It was tracked down to a bug in `read_key_sequence': it failed to reinitialize its @@ -1359,4 +1359,3 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/admin/notes/nextstep b/admin/notes/nextstep index 462101f9abf..cf0ebbc11aa 100644 --- a/admin/notes/nextstep +++ b/admin/notes/nextstep @@ -78,7 +78,7 @@ Text Rendering and Font Handling nsfont.m implements the font driver, responsible for managing fonts and rendering text. Fonts are obtained through NSFontManager. Rendering must be done at a low level due to emacs' fine control over this process, therefore -there are different approachs under Cocoa and GNUstep. Under GNUstep, the +there are different approaches under Cocoa and GNUstep. Under GNUstep, the original NeXT Display PostScript (DPS) APIs are available and used. Under Cocoa, these were removed and Quartz drawing functions replaced them. @@ -156,4 +156,3 @@ EmacsPrefsController : NSObject EmacsSavePanel : NSSavePanel EmacsOpenPanel : NSOpenPanel - utility override for panel notifications - diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index 5dee94f28c5..82e33cc5418 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -73,10 +73,11 @@ See the end of the file for license conditions. * Image support - Emacs 24.1 contains support for images, however for most image formats - supporting libraries are required. This distribution has been tested - with the libraries that are distributed with GTK for Windows, and the - libraries found at http://gnuwin32.sourceforge.net/. The following image + Emacs 24.1 contains support for images, however for most image + formats supporting libraries are required. This distribution has + been tested with the libraries that are distributed with GTK for + Windows (http://www.gtk.org/download/win32.php), and the libraries + found at http://gnuwin32.sourceforge.net/. The following image formats are supported: PBM/PGM/PPM: Supported natively by Emacs. This format is used for @@ -87,12 +88,16 @@ See the end of the file for license conditions. can be replaced by other versions with the name xpm4.dll, libxpm-nox4.dll or libxpm.dll. - PNG: requires the PNG reference library 1.2 or later, which will - be named libpng13d.dll, libpng13.dll, libpng12d.dll, libpng12.dll - or libpng.dll. LibPNG requires zlib, which should come from the same - source as you got libpng. + PNG: requires the PNG reference library 1.4 or later, which will + be named libpng14.dll or libpng14-14.dll. LibPNG requires zlib, + which should come from the same source as you got libpng. + Starting with Emacs 23.3, the precompiled Emacs binaries are + built with libpng 1.4.x and later, and are incompatible with + earlier versions of libpng DLLs. So if you have libpng 1.2.x, + the PNG support will not work, and you will have to download + newer versions. - JPEG: requires the Independant JPEG Group's libjpeg 6b or later, + JPEG: requires the Independent JPEG Group's libjpeg 6b or later, which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in index 96a1f5b86fd..0e9b9f0d2bd 100644 --- a/admin/unidata/makefile.w32-in +++ b/admin/unidata/makefile.w32-in @@ -52,5 +52,5 @@ charprop-CMD: unidata-gen.elc unidata.txt ${DSTDIR}/charprop.el: charprop-$(SHELLTYPE) clean: - - $(DEL) unidata-gen.elc unidata.txt biditype.h bidimirror.h + - $(DEL) unidata-gen.elc unidata.txt diff --git a/autogen/configure b/autogen/configure index 88a63c8b4f7..eb7c9428f3a 100755 --- a/autogen/configure +++ b/autogen/configure @@ -11692,23 +11692,23 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.6.0" >&5 -$as_echo_n "checking for gnutls >= 2.6.0... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 2.6.6" >&5 +$as_echo_n "checking for gnutls >= 2.6.6... " >&6; } - if $PKG_CONFIG --exists "gnutls >= 2.6.0" 2>&5; then + if $PKG_CONFIG --exists "gnutls >= 2.6.6" 2>&5; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } succeeded=yes { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_CFLAGS" >&5 $as_echo_n "checking LIBGNUTLS_CFLAGS... " >&6; } - LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.6.0"|sed -e 's,///*,/,g'` + LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 2.6.6"|sed -e 's,///*,/,g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_CFLAGS" >&5 $as_echo "$LIBGNUTLS_CFLAGS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGNUTLS_LIBS" >&5 $as_echo_n "checking LIBGNUTLS_LIBS... " >&6; } - LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.6.0"|sed -e 's,///*,/,g'` + LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 2.6.6"|sed -e 's,///*,/,g'` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_LIBS" >&5 $as_echo "$LIBGNUTLS_LIBS" >&6; } else @@ -11718,7 +11718,7 @@ $as_echo "no" >&6; } LIBGNUTLS_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.6.0"` + LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnutls >= 2.6.6"` fi @@ -22425,7 +22425,7 @@ echo " Does Emacs use -ldbus? ${HAVE_DBUS}" echo " Does Emacs use -lgconf? ${HAVE_GCONF}" echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" -echo " Does Emacs use -lgnutls (2.6.x or higher)? ${HAVE_GNUTLS}" +echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" diff --git a/configure.in b/configure.in index 54fba2553bb..73e1d07edb7 100644 --- a/configure.in +++ b/configure.in @@ -1348,7 +1348,7 @@ AH_TEMPLATE(POINTER_TYPE, [Define as `void' if your compiler accepts `void *'; otherwise define as `char'.])dnl -dnl Check for endianess +dnl Check for endianness. AC_C_BIGENDIAN AC_CACHE_CHECK([for __attribute__ ((__aligned__ (expr)))], @@ -1593,7 +1593,7 @@ case "${window_system}" in athena | lucid ) USE_X_TOOLKIT=LUCID ;; motif ) USE_X_TOOLKIT=MOTIF ;; gtk ) with_gtk=yes -dnl Dont set this for GTK. A lot of tests below assumes Xt when +dnl Don't set this for GTK. A lot of tests below assumes Xt when dnl USE_X_TOOLKIT is set. USE_X_TOOLKIT=none ;; gtk3 ) with_gtk3=yes @@ -2063,7 +2063,7 @@ AC_SUBST(LIBSELINUX_LIBS) HAVE_GNUTLS=no HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no if test "${with_gnutls}" = "yes" ; then - PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.0], HAVE_GNUTLS=yes, HAVE_GNUTLS=no) + PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, HAVE_GNUTLS=no) if test "${HAVE_GNUTLS}" = "yes"; then AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.]) fi @@ -3720,7 +3720,7 @@ echo " Does Emacs use -ldbus? ${HAVE_DBUS}" echo " Does Emacs use -lgconf? ${HAVE_GCONF}" echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" -echo " Does Emacs use -lgnutls (2.6.x or higher)? ${HAVE_GNUTLS}" +echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 9a501d38375..b796acd8b39 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,33 @@ +2011-11-17 Glenn Morris <rgm@gnu.org> + + * regs.texi (Bookmarks): Small fixes related to saving. (Bug#10058) + +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * killing.texi (Rectangles): + * misc.texi (Document View): + * modes.texi (Choosing Modes): + * msdog.texi (Windows Fonts): + * regs.texi (Rectangle Registers): + * search.texi (Isearch Yank): Fix typos. + +2011-11-06 Chong Yidong <cyd@gnu.org> + + * windows.texi (Basic Window): Add xref to Cursor Display. + (Split Window): Document negative arg for splitting commands. + (Other Window): Document mouse-1 in text area of window. + (Change Window): Don't mention window attributes, since they + aren't defined. C-x 1 can't be used with minibuffer windows. + Windows are no longer auto-deleted. + (Window Choice): Add xref to Choosing Window in Lisp manual. + (Window Convenience): Note that windmove disables shift-selection. + Move M-x compare-windows here from Other Window node. + + * custom.texi (Mouse Buttons): + * search.texi (Isearch Scroll): + * windows.texi (Split Window): Use new names split-window-below + and split-window-right. + 2011-10-26 Juanma Barranquero <lekktu@gmail.com> * emacs.texi (Top): Fix typo. @@ -1209,7 +1239,8 @@ 2010-03-27 Nick Roberts <nickrob@snap.net.nz> - doc/emacs/building.texi: Describe restored GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. + doc/emacs/building.texi: Describe restored GDB/MI functionality + removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. doc/emacs/emacs.texi: Update node names for building.texi. 2010-03-24 Glenn Morris <rgm@gnu.org> @@ -1694,7 +1725,7 @@ (Table of Resources): Document fontBackend resource. * trouble.texi (Quitting): Add other undo bindings to table. - (DEL Does Not Delete): Note that the erasure key is usually labelled + (DEL Does Not Delete): Note that the erasure key is usually labeled "Backspace". Remove discussion of obscure Xmodmap issue. 2009-05-07 Chong Yidong <cyd@stupidchicken.com> diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index 1cfb3d9ffe9..6801c7f1e0e 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -99,7 +99,7 @@ ERC distribution). @item Scott Bender, Michael Brouwer, Christophe de Dinechin, Carl Edman, -Christian Limpach and Adrian Robert developed and maintained the +Christian Limpach and Adrian Robert developed and maintained the NeXTstep port of Emacs. @item @@ -206,7 +206,7 @@ use it, Snake and Tetris. @item Andrew Cohen wrote @file{spam-wash.el}, to decode and clean email before -it is analysed for spam. +it is analyzed for spam. @item Georges Brun-Cottan and Stefan Monnier wrote @file{easy-mmode.el}, a @@ -576,7 +576,7 @@ Emacs. @item Karel Kl@v{c} contributed SELinux support, for preserving the -Security-Enchanced Linux context of files on backup and copy. +Security-Enhanced Linux context of files on backup and copy. @item Shuhei Kobayashi wrote @file{hex-util.el}, for operating on hexadecimal diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index cca9e441ed4..ac62e2d9652 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1251,7 +1251,7 @@ screen Emacs frame. In all-stop mode, whenever your program stops, @emph{all} threads of execution stop. Likewise, whenever you restart the program, all threads start executing. @xref{All-Stop Mode, , All-Stop Mode, gdb, -The GNU debugger}. You can enable this behaviour in Emacs by setting +The GNU debugger}. You can enable this behavior in Emacs by setting @code{gdb-non-stop-setting} to @code{nil} before starting a debugging session. diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index d87c22ec28e..5b98216369d 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -82,7 +82,7 @@ under it. It looks like this, in part: @group /- Emacs group: Customization of the One True Editor. -------------\ [State]: visible group members are all at standard values. - + See also [Manual]. [Editing] : Basic text editing facilities. @@ -547,7 +547,7 @@ such collections from one computer to another. To define a Custom theme, use @kbd{M-x customize-create-theme}, which brings up a buffer named @samp{*New Custom Theme*}. At the top of the buffer is an editable field where you can specify the name of -the theme. Click on the button labelled @samp{Insert Variable} to add +the theme. Click on the button labeled @samp{Insert Variable} to add a variable to the theme, and click on @samp{Insert Face} to add a face. You can edit these values in the @samp{*New Custom Theme*} buffer like in an ordinary Customize buffer. To remove an option from @@ -1068,7 +1068,7 @@ other context has no special meaning. well as the major modes; in fact, you can use it more than once, first to set the major mode and then to enable minor modes which are specific to particular buffers. Using @code{mode} for minor modes -is deprecated, though---instead, use @code{eval: (minor-mode 1)}. +is deprecated, though---instead, use @code{eval: (minor-mode 1)}. Often, however, it is a mistake to enable minor modes in file local variables. Most minor modes, like Auto Fill mode, represent individual user @@ -1646,7 +1646,7 @@ ways to use these modifiers; the key labeled @key{Alt} on most keyboards usually issues the @key{Meta} modifier, not @key{Alt}. The standard key bindings in Emacs do not include any characters with these modifiers. However, you can customize Emacs to assign meanings -to them. The modifier bits are labelled as @samp{s-}, @samp{H-} and +to them. The modifier bits are labeled as @samp{s-}, @samp{H-} and @samp{A-} respectively. Even if your keyboard lacks these additional modifier keys, you can @@ -1774,7 +1774,7 @@ button, @code{mouse-2} for the next, and so on. Here is how you can redefine the second mouse button to split the current window: @example -(global-set-key [mouse-2] 'split-window-vertically) +(global-set-key [mouse-2] 'split-window-below) @end example The symbols for drag events are similar, but have the prefix diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi index 6237b00c2ee..1443ad019bb 100644 --- a/doc/emacs/killing.texi +++ b/doc/emacs/killing.texi @@ -733,7 +733,7 @@ insert rectangles, and commands to make blank rectangles. @findex delete-rectangle There are two ways to erase the text in a rectangle: @kbd{C-x r d} (@code{delete-rectangle}) to delete the text outright, or @kbd{C-x r -k} (@code{kill-rectangle}) to remove the text and and save it as the +k} (@code{kill-rectangle}) to remove the text and save it as the @dfn{last killed rectangle}. In both cases, erasing the region-rectangle is like erasing the specified text on each line of the rectangle; if there is any following text on the line, it moves diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi index 5a97fa8460b..3e1e67fecd8 100644 --- a/doc/emacs/macos.texi +++ b/doc/emacs/macos.texi @@ -120,7 +120,7 @@ Useful in this context is the listing of all faces obtained by @key{M-x} @subsection Open files by dragging to an Emacs window -The default behaviour when a user drags files from another application +The default behavior when a user drags files from another application into an Emacs frame is to insert the contents of all the dragged files into the current buffer. To remap the @code{ns-drag-file} event to open the dragged files in the current frame use the following line: diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index d7639b3b665..714e7f3441c 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -236,7 +236,7 @@ for @var{regexp}. @cindex DVI file @cindex PDF file @cindex PS file -@cindex Postscript file +@cindex PostScript file @cindex OpenDocument file @cindex Microsoft Office file @cindex DocView mode @@ -244,7 +244,7 @@ for @var{regexp}. @cindex document viewer (DocView) @findex doc-view-mode -DocView mode (@code{doc-view-mode}) is a viewer for DVI, Postscript +DocView mode (@code{doc-view-mode}) is a viewer for DVI, PostScript (PS), PDF, OpenDocument, and Microsoft Office documents. It provides features such as slicing, zooming, and searching inside documents. It works by converting the document to a set of images using the @@ -257,16 +257,16 @@ displaying those images. @findex doc-view-toggle-display @findex doc-view-toggle-display @cindex doc-view-minor-mode - When you visit a document file with the exception of Postscript + When you visit a document file with the exception of PostScript files, Emacs automatically switches to DocView mode if possible @footnote{The needed external tools for this document type have to be available, emacs needs to run in a graphical frame, and PNG image support has to be compiled into emacs. If any of these requirements is not fulfilled, DocView falls back to an appropriate mode.}. When -you visit a Postscript file, Emacs switches to PS mode, a major mode -for editing Postscript files as text; however, it also enables DocView +you visit a PostScript file, Emacs switches to PS mode, a major mode +for editing PostScript files as text; however, it also enables DocView minor mode, so you can type @kbd{C-c C-c} to view the document with -DocView. (PDF and DVI files, unlike Postscript files, are not usually +DocView. (PDF and DVI files, unlike PostScript files, are not usually human-editable.) In either case, repeating @kbd{C-c C-c} (@code{doc-view-toggle-display}) toggles between DocView and the file text. diff --git a/doc/emacs/modes.texi b/doc/emacs/modes.texi index d82423a73b4..5a786be62cf 100644 --- a/doc/emacs/modes.texi +++ b/doc/emacs/modes.texi @@ -368,7 +368,7 @@ compares the text at the start of the buffer to the variable @code{magic-mode-alist}, described above, except that is consulted only after @code{auto-mode-alist}. By default, @code{magic-fallback-mode-alist} contains forms that check for image -files, HTML/XML/SGML files, and Postscript files. +files, HTML/XML/SGML files, and PostScript files. @vindex major-mode Once a major mode is chosen, Emacs sets the value of the variable diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 533872ddf61..bbaf31ade85 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -322,7 +322,7 @@ default value is @code{(links uid gid)} i.e.@: all the 3 optional attributes are displayed. @vindex ls-lisp-emulation - The variable @code{ls-lisp-emulation} controls the flavour of the + The variable @code{ls-lisp-emulation} controls the flavor of the @code{ls} emulation by setting the defaults for the 3 options described above: @code{ls-lisp-ignore-case}, @code{ls-lisp-dirs-first}, and @code{ls-lisp-verbosity}. The value of @@ -868,7 +868,7 @@ and @code{uniscribe} font backends are supported on Windows. The @code{gdi} font backend is available on all versions of Windows, and supports all fonts that are natively supported by Windows. The @code{uniscribe} font backend is available on Windows 2000 and later, -and supports Truetype and Opentype fonts. Some languages requiring +and supports TrueType and OpenType fonts. Some languages requiring complex layout can only be properly supported by the uniscribe backend. By default, both backends are enabled if supported, with @code{uniscribe} taking priority over @code{gdi}. @@ -914,7 +914,7 @@ as a fallback with the font family left unspecified. @vindex w32-charset-info-alist @item registry Specifies the character set registry that the font is -expected to cover. Most Truetype and Opentype fonts will be unicode fonts +expected to cover. Most TrueType and OpenType fonts will be unicode fonts that cover several national character sets, but you can narrow down the selection of fonts to those that support a particular character set by using a specific registry from @code{w32-charset-info-alist} here. diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi index 41a807375a9..f7fd52bd28d 100644 --- a/doc/emacs/regs.texi +++ b/doc/emacs/regs.texi @@ -145,7 +145,7 @@ rectangle) (@code{insert-register}). The @kbd{C-x r i @var{r}} (@code{insert-register}) command, previously documented in @ref{Text Registers}, inserts a rectangle -rather than a a text string, if the register contains a rectangle. +rather than a text string, if the register contains a rectangle. @node Configuration Registers @section Saving Window Configurations in Registers @@ -278,7 +278,7 @@ you can use it to edit your bookmark definitions or annotate the bookmarks. Type @kbd{C-h m} in the bookmark buffer for more information about its special editing commands. - When you kill Emacs, Emacs offers to save your bookmark values, if + When you kill Emacs, Emacs saves your bookmarks, if you have changed any bookmark values. You can also save the bookmarks at any time with the @kbd{M-x bookmark-save} command. Bookmarks are saved to the file @file{~/.emacs.d/bookmarks} (for compatibility with @@ -290,9 +290,10 @@ persist from one Emacs session to the next. @vindex bookmark-save-flag If you set the variable @code{bookmark-save-flag} to 1, each command that sets a bookmark will also save your bookmarks; this way, you -don't lose any bookmark values even if Emacs crashes. (The value, if +don't lose any bookmark values even if Emacs crashes. The value, if a number, says how many bookmark modifications should go by between -saving.) +saving. If you set this variable to @code{nil}, Emacs only +saves bookmarks if you explicitly use @kbd{M-x bookmark-save}. @vindex bookmark-search-size Bookmark position values are saved with surrounding context, so that diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index a8bd1cdf18d..c6747042df5 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -309,7 +309,7 @@ search remains case-insensitive. @findex isearch-yank-char @kbd{C-M-w} (@code{isearch-del-char}) deletes the last character from the search string, and @kbd{C-M-y} (@code{isearch-yank-char}) -appends the character after point to the the search string. An +appends the character after point to the search string. An alternative method to add the character after point is to enter the minibuffer with @kbd{M-e} (@pxref{Repeat Isearch}) and type @kbd{C-f} at the end of the search string in the minibuffer. @@ -328,12 +328,11 @@ prefix arguments to these commands in the usual way. This feature won't let you scroll the current match out of visibility, however. The @code{isearch-allow-scroll} feature also affects some other -commands, such as @kbd{C-x 2} (@code{split-window-vertically}) and -@kbd{C-x ^} (@code{enlarge-window}), which don't exactly scroll but do -affect where the text appears on the screen. It applies to any -command whose name has a non-@code{nil} @code{isearch-scroll} -property. So you can control which commands are affected by changing -these properties. +commands, such as @kbd{C-x 2} (@code{split-window-below}) and @kbd{C-x +^} (@code{enlarge-window}), which don't exactly scroll but do affect +where the text appears on the screen. It applies to any command whose +name has a non-@code{nil} @code{isearch-scroll} property. So you can +control which commands are affected by changing these properties. For example, to make @kbd{C-h l} usable within an incremental search in all future Emacs sessions, use @kbd{C-h c} to find what command it diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index ec159af6f84..ae7550d0fae 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -161,7 +161,7 @@ in the Emacs distribution. Type @kbd{C-h C-f} to read the FAQ; type @cindex @key{BACKSPACE} vs @key{DEL} @cindex usual erasure key - Every keyboard has a large key, usually labelled @key{Backspace}, + Every keyboard has a large key, usually labeled @key{Backspace}, which is ordinarily used to erase the last character that you typed. We call this key @dfn{the usual erasure key}. In Emacs, it is supposed to be equivalent to @key{DEL}. diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 600d0b07818..ad2040c9047 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -34,24 +34,22 @@ has its own value of point. @cindex selected window At any time, one Emacs window is the @dfn{selected window}; the -buffer this window is displaying is the current buffer. The terminal's -cursor shows the location of point in this window. Each other window -has a location of point as well. On text-only terminals, there is no -way to show where those locations are, since the terminal has only one -cursor. On a graphical display, the location of point in a -non-selected window is indicated by a hollow box; the cursor in the -selected window is blinking or solid. - - Commands to move point affect the value of point for the selected Emacs -window only. They do not change the value of point in other Emacs -windows, even those showing the same buffer. The same is true for commands -such as @kbd{C-x b} to switch buffers in the selected window; -they do not affect other windows at all. However, there are other commands -such as @kbd{C-x 4 b} that select a different window and switch buffers in -it. Also, all commands that display information in a window, including +buffer this window is displaying is the current buffer. Each window +has its own value of point. On graphical displays, the point is +indicated by a solid blinking cursor in the selected window, and by a +hollow box in non-selected windows. On text-only terminals, the +cursor is drawn only in the selected window. @xref{Cursor Display}. + + Commands to move point affect the value of point for the selected +Emacs window only. They do not change the value of point in other +Emacs windows, even those showing the same buffer. The same is true +for buffer-switching commands such as @kbd{C-x b}; they do not affect +other windows at all. However, there are other commands such as +@kbd{C-x 4 b} that select a different window and switch buffers in it. +Also, all commands that display information in a window, including (for example) @kbd{C-h f} (@code{describe-function}) and @kbd{C-x C-b} -(@code{list-buffers}), work by switching buffers in a nonselected window -without affecting the selected window. +(@code{list-buffers}), work by switching buffers in a nonselected +window without affecting the selected window. When multiple windows show the same buffer, they can have different regions, because they can have different values of point. However, @@ -61,7 +59,7 @@ only one mark position. Each window has its own mode line, which displays the buffer name, modification status and major and minor modes of the buffer that is displayed in the window. The selected window's mode line appears in a -different color. @xref{Mode Line}, for full details on the mode line. +different color. @xref{Mode Line}, for details. @node Split Window @section Splitting Windows @@ -69,91 +67,87 @@ different color. @xref{Mode Line}, for full details on the mode line. @table @kbd @item C-x 2 Split the selected window into two windows, one above the other -(@code{split-window-vertically}). +(@code{split-window-below}). @item C-x 3 -Split the selected window into two windows positioned side by side -(@code{split-window-horizontally}). +Split the selected window into two windows, positioned side by side +(@code{split-window-right}). @item C-Mouse-2 In the mode line or scroll bar of a window, split that window. @end table @kindex C-x 2 -@findex split-window-vertically - The command @kbd{C-x 2} (@code{split-window-vertically}) breaks the -selected window into two windows, one above the other. Both windows start -out displaying the same buffer, with the same value of point. By default -the two windows each get half the height of the window that was split; a -numeric argument specifies how many lines to give to the top window. +@findex split-window-below + @kbd{C-x 2} (@code{split-window-below}) splits the selected window +into two windows, one above the other. After splitting, the selected +window is the upper one, and the newly split-off window is below. +Both windows have the same value of point as before, and display the +same portion of the buffer (or as close to it as possible). If +necessary, the windows are scrolled to keep point on-screen. By +default, the two windows each get half the height of the original +window. A positive numeric argument specifies how many lines to give +to the top window; a negative numeric argument specifies how many +lines to give to the bottom window. -@kindex C-x 3 -@findex split-window-horizontally - @kbd{C-x 3} (@code{split-window-horizontally}) breaks the selected -window into two side-by-side windows. A numeric argument specifies how -many columns to give the one on the left. If you are not using -scrollbars, a vertical line separates the two windows. -You can customize its color with the face @code{vertical-border}. -Windows that are not the full width of the screen have mode lines, but -they are truncated. On terminals where Emacs does not support -highlighting, truncated mode lines sometimes do not appear in inverse -video. +@vindex split-window-keep-point + If you change the variable @code{split-window-keep-point} to +@code{nil}, @kbd{C-x 2} instead adjusts the portion of the buffer +displayed by the two windows, as well as the value of point in each +window, in order to keep the text on the screen as close as possible +to what it was before; furthermore, if point was in the lower half of +the original window, the bottom window is selected instead of the +upper one. -@kindex C-Mouse-2 @r{(scroll bar)} - You can split a window horizontally or vertically by clicking -@kbd{C-Mouse-2} in the mode line or the scroll bar. The line of -splitting goes through the place where you click: if you click on the -mode line, the new scroll bar goes above the spot; if you click in the -scroll bar, the mode line of the split window is side by side with -your click. +@kindex C-x 3 +@findex split-window-right + @kbd{C-x 3} (@code{split-window-right}) splits the selected window +into two side-by-side windows. The left window is the selected one; +the right window displays the same portion of the same buffer, and has +the same value of point. A positive numeric argument specifies how +many columns to give the left window; a negative numeric argument +specifies how many columns to give the right window. @vindex truncate-partial-width-windows - When a window occupies less than the full width of the frame, it may -become too narrow for most of the text lines in its buffer. If most of -its lines are continued (@pxref{Continuation Lines}), the buffer may -become difficult to read. Therefore, Emacs automatically truncates -lines if the window width becomes narrower than 50 columns. This -truncation occurs regardless of the value of the variable -@code{truncate-lines} (@pxref{Line Truncation}); it is instead -controlled by the variable @code{truncate-partial-width-windows}. If -the value of @code{truncate-partial-width-windows} is a positive integer -(the default is 50), that specifies the minimum width for a -partial-width window before automatic line truncation occurs; if the -value is @code{nil}, automatic line truncation is disabled; and for any -other non-@code{nil} value, Emacs truncates lines in every partial-width -window regardless of its width. - - Horizontal scrolling is often used in side-by-side windows. -@xref{Horizontal Scrolling}. + When you split a window with @kbd{C-x 3}, each resulting window +occupies less than the full width of the frame. If it becomes too +narrow, the buffer may be difficult to read if continuation lines are +in use (@pxref{Continuation Lines}). Therefore, Emacs automatically +switches to line truncation if the window width becomes narrower than +50 columns. This truncation occurs regardless of the value of the +variable @code{truncate-lines} (@pxref{Line Truncation}); it is +instead controlled by the variable +@code{truncate-partial-width-windows}. If the value of this variable +is a positive integer (the default is 50), that specifies the minimum +width for a partial-width window before automatic line truncation +occurs; if the value is @code{nil}, automatic line truncation is +disabled; and for any other non-@code{nil} value, Emacs truncates +lines in every partial-width window regardless of its width. + + On text terminals, side-by-side windows are separated by a vertical +divider which is drawn using the @code{vertical-border} face. -@vindex split-window-keep-point - If @code{split-window-keep-point} is non-@code{nil}, the default, -both of the windows resulting from @kbd{C-x 2} inherit the value of -point from the window that was split. This means that scrolling is -inevitable. If this variable is @code{nil}, then @kbd{C-x 2} tries to -avoid scrolling the text currently visible on the screen, by putting -point in each window at a position already visible in the window. It -also selects whichever window contains the screen line that the cursor -was previously on. Some users prefer that mode on slow terminals. +@kindex C-Mouse-2 @r{(scroll bar)} + You can also split a window horizontally or vertically by clicking +@kbd{C-Mouse-2} in the mode line or the scroll bar. If you click on +the mode line, that puts the vertical divider where you click; if you +click in the scroll bar, that puts the new mode-line where you click. @node Other Window @section Using Other Windows @table @kbd @item C-x o -Select another window (@code{other-window}). That is @kbd{o}, not zero. +Select another window (@code{other-window}). @item C-M-v Scroll the next window (@code{scroll-other-window}). -@item M-x compare-windows -Find next place where the text in the selected window does not match -the text in the next window. @item Mouse-1 -@kbd{Mouse-1}, in a window's mode line, selects that window -but does not move point in it (@code{mouse-select-window}). +@kbd{Mouse-1}, in the text area of a window, selects the window and +moves point to the position clicked. Clicking in the mode line +selects the window without moving point in it. @end table @kindex C-x o @findex other-window - To select a different window, click with @kbd{Mouse-1} on its mode -line. With the keyboard, you can switch windows by typing @kbd{C-x o} +With the keyboard, you can switch windows by typing @kbd{C-x o} (@code{other-window}). That is an @kbd{o}, for ``other,'' not a zero. When there are more than two windows, this command moves through all the windows in a cyclic order, generally top to bottom and left to right. @@ -172,17 +166,13 @@ finish supplying the minibuffer argument that is requested. window only, but there is one command to scroll the next window. @kbd{C-M-v} (@code{scroll-other-window}) scrolls the window that @kbd{C-x o} would select. It takes arguments, positive and negative, -like @kbd{C-v}. (In the minibuffer, @kbd{C-M-v} scrolls the window -that contains the minibuffer help display, if any, rather than the -next window in the standard cyclic order.) - - The command @kbd{M-x compare-windows} lets you compare two files or -buffers visible in two windows, by moving through them to the next -mismatch. @xref{Comparing Files}, for details. +like @kbd{C-v}. (In the minibuffer, @kbd{C-M-v} scrolls the help +window associated with the minibuffer, if any, rather than the next +window in the standard cyclic order; @pxref{Minibuffer Edit}.) @vindex mouse-autoselect-window If you set @code{mouse-autoselect-window} to a non-@code{nil} value, -moving the mouse into a different window selects that window. This +moving the mouse over a different window selects that window. This feature is off by default. @node Pop Up Window @@ -236,8 +226,7 @@ window (@code{find-file-read-only-other-window}). @xref{Visiting}. @table @kbd @item C-x 0 -Delete the selected window (@code{delete-window}). The last character -in this key sequence is a zero. +Delete the selected window (@code{delete-window}). @item C-x 1 Delete all windows in the selected frame except the selected window (@code{delete-other-windows}). @@ -260,14 +249,12 @@ Make all windows the same height (@code{balance-windows}). @kindex C-x 0 @findex delete-window - To delete a window, type @kbd{C-x 0} (@code{delete-window}). (That is -a zero.) The space occupied by the deleted window is given to an -adjacent window (but not the minibuffer window, even if that is active -at the time). Once a window is deleted, its attributes are forgotten; -only restoring a window configuration can bring it back. Deleting the + To delete the selected window, type @kbd{C-x 0} +(@code{delete-window}). (That is a zero.) Once a window is deleted, +the space that it occupied is given to an adjacent window (but not the +minibuffer window, even if that is active at the time). Deleting the window has no effect on the buffer it used to display; the buffer -continues to exist, and you can select it in any window with @kbd{C-x -b}. +continues to exist, and you can still switch to with @kbd{C-x b}. @findex kill-buffer-and-window @kindex C-x 4 0 @@ -277,31 +264,35 @@ selected window. @kindex C-x 1 @findex delete-other-windows - @kbd{C-x 1} (@code{delete-other-windows}) is more powerful in a -different way; it deletes all the windows except the selected one (and -the minibuffer); the selected window expands to use the whole frame -except for the echo area. + @kbd{C-x 1} (@code{delete-other-windows}) deletes all the windows, +@emph{except} the selected one; the selected window expands to use the +whole frame. (This command cannot be used while the minibuffer window +is active; attempting to do so signals an error.) @kindex C-x ^ @findex enlarge-window @kindex C-x @} -@findex enlarge-window-horizontally @vindex window-min-height + The command @kbd{C-x ^} (@code{enlarge-window}) makes the selected +window one line taller, taking space from a vertically adjacent window +without changing the height of the frame. With a positive numeric +argument, this command increases the window height by that many lines; +with a negative argument, it reduces the height by that many lines. +If there are no vertically adjacent windows (i.e. the window is at the +full frame height), that signals an error. The command also signals +an error if you attempt to reduce the height of any window below a +certain minimum number of lines, specified by the variable +@code{window-min-height} (the default is 4). + +@findex enlarge-window-horizontally +@findex shrink-window-horizontally @vindex window-min-width - To readjust the division of space among vertically adjacent windows, -use @kbd{C-x ^} (@code{enlarge-window}). It makes the currently -selected window one line bigger, or as many lines as is specified -with a numeric argument. With a negative argument, it makes the -selected window smaller. @kbd{C-x @}} -(@code{enlarge-window-horizontally}) makes the selected window wider by -the specified number of columns. @kbd{C-x @{} -(@code{shrink-window-horizontally}) makes the selected window narrower -by the specified number of columns. - - When you make a window bigger, the space comes from its peers. If -this makes any window too small, it is deleted and its space is given -to an adjacent window. The minimum size is specified by the variables -@code{window-min-height} and @code{window-min-width}. + Similarly, @kbd{C-x @}} (@code{enlarge-window-horizontally}) makes +the selected window wider, and @kbd{C-x @{} +(@code{shrink-window-horizontally}) makes it narrower. These commands +signal an error if you attempt to reduce the width of any window below +a certain minimum number of columns, specified by the variable +@code{window-min-width} (the default is 10). @kindex C-x - @findex shrink-window-if-larger-than-buffer @@ -322,7 +313,7 @@ heights and to delete windows. @xref{Mode Line Mouse}. @section Displaying a Buffer in a Window It is a common Emacs operation to display or ``pop up'' some buffer -in response to a user command. There are several different ways by +in response to a user command. There are several different ways in which commands do this. Many commands, like @kbd{C-x C-f} (@code{find-file}), display the @@ -333,18 +324,18 @@ usually work by calling @code{switch-to-buffer} internally @findex display-buffer Some commands try to display ``intelligently'', trying not to take -over the selected window, e.g. by splitting the selected window and -displaying the desired buffer in the child window. Such commands, -which include the various help commands (@pxref{Help}), work by -calling @code{display-buffer} internally. @xref{Window Choice}, for -details. +over the selected window, e.g. by splitting off a new window and +displaying the desired buffer there. Such commands, which include the +various help commands (@pxref{Help}), work by calling +@code{display-buffer} internally. @xref{Window Choice}, for details. Other commands do the same as @code{display-buffer}, and additionally select the displaying window so that you can begin editing its buffer. The command @kbd{C-x `} (@code{next-error}) is one example (@pxref{Compilation Mode}). Such commands work by calling -@code{pop-to-buffer} internally. @xref{Switching Buffers,,Switching -to a Buffer in a Window, elisp, The Emacs Lisp Reference Manual}. +the function @code{pop-to-buffer} internally. @xref{Switching +Buffers,,Switching to a Buffer in a Window, elisp, The Emacs Lisp +Reference Manual}. Commands with names ending in @code{-other-window} behave like @code{display-buffer}, except that they never display in the selected @@ -367,7 +358,10 @@ Several of these commands are bound in the @kbd{C-x 5} prefix key. @findex display-buffer The @code{display-buffer} command (as well as commands that call it -internally) chooses a window to display using the following steps: +internally) chooses a window to display by following the steps given +below. @xref{Choosing Window,,Choosing a Window for Display, elisp, +The Emacs Lisp Reference Manual}, for details about how to alter this +sequence of steps. @itemize @vindex same-window-buffer-names @@ -433,36 +427,38 @@ and display the buffer there. @cindex mode, Winner @cindex undoing window configuration changes @cindex window configuration changes, undoing - @kbd{M-x winner-mode} is a global minor mode that records the -changes in the window configuration (i.e. how the frames are -partitioned into windows), so that you can ``undo'' them. To undo, -use @kbd{C-c left} (@code{winner-undo}). If you change your mind -while undoing, you can redo the changes you had undone using @kbd{C-c -right} (@code{M-x winner-redo}). Another way to enable Winner mode is -by customizing the variable @code{winner-mode}. + Winner mode is a global minor mode that records the changes in the +window configuration (i.e. how the frames are partitioned into +windows), so that you can ``undo'' them. You can toggle Winner mode +with @kbd{M-x winner-mode}, or by customizing the variable +@code{winner-mode}. When the mode is enabled, @kbd{C-c left} +(@code{winner-undo}) undoes the last window configuration change. If +you change your mind while undoing, you can redo the changes you had +undone using @kbd{C-c right} (@code{M-x winner-redo}). + + Follow mode (@kbd{M-x follow-mode}) synchronizes several windows on +the same buffer so that they always display adjacent sections of that +buffer. @xref{Follow Mode}. @cindex Windmove package @cindex directional window selection @findex windmove-right @findex windmove-default-keybindings - The Windmove commands move directionally between neighboring windows in -a frame. @kbd{M-x windmove-right} selects the window immediately to the -right of the currently selected one, and similarly for the ``left,'' ``up,'' -and ``down'' counterparts. @kbd{M-x windmove-default-keybindings} binds -these commands to @kbd{S-right} etc. (Not all terminals support shifted -arrow keys, however.) + The Windmove package defines commands for moving directionally +between neighboring windows in a frame. @kbd{M-x windmove-right} +selects the window immediately to the right of the currently selected +one, and similarly for the ``left,'' ``up,'' and ``down'' +counterparts. @kbd{M-x windmove-default-keybindings} binds these +commands to @kbd{S-right} etc.; doing so disables shift selection for +those keys (@pxref{Shift Selection}). - Follow minor mode (@kbd{M-x follow-mode}) synchronizes several -windows on the same buffer so that they always display adjacent -sections of that buffer. @xref{Follow Mode}. + The command @kbd{M-x compare-windows} lets you compare the text +shown in different windows. @xref{Comparing Files}. @vindex scroll-all-mode @cindex scrolling windows together @cindex Scroll-all mode @cindex mode, Scroll-all - @kbd{M-x scroll-all-mode} provides commands to scroll all visible -windows together. You can also turn it on by customizing the variable -@code{scroll-all-mode}. The commands provided are @kbd{M-x -scroll-all-scroll-down-all}, @kbd{M-x scroll-all-page-down-all} and -their corresponding ``up'' equivalents. To make this mode useful, -you should bind these commands to appropriate keys. + Scroll All mode (@kbd{M-x scroll-all-mode}) is a global minor mode +that causes scrolling commands and point motion commands to apply to +every single window. diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 9d3894c38fc..bdcd9e9aea8 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * emacs-lisp-intro.texi (etags): Fix typo. + 2011-03-07 Chong Yidong <cyd@stupidchicken.com> * Version 23.3 released. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 11ceea19eef..ef04626e95f 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -11,7 +11,7 @@ @c --------- @c <<<< For hard copy printing, this file is now @c set for smallbook, which works for all sizes -@c of paper, and with Postscript figures >>>> +@c of paper, and with PostScript figures >>>> @set smallbook @ifset smallbook @smallbook @@ -357,7 +357,7 @@ every node in every chapter. * Conclusion:: Now you have the basics. * the-the:: An appendix: how to find reduplicated words. * Kill Ring:: An appendix: how the kill ring works. -* Full Graph:: How to create a graph with labelled axes. +* Full Graph:: How to create a graph with labeled axes. * Free Software and Free Manuals:: * GNU Free Documentation License:: * Index:: @@ -793,9 +793,9 @@ The @code{current-kill} Function * Digression concerning error:: How to mislead humans, but not computers. * Determining the Element:: -A Graph with Labelled Axes +A Graph with Labeled Axes -* Labelled Example:: +* Labeled Example:: * print-graph Varlist:: @code{let} expression in @code{print-graph}. * print-Y-axis:: Print a label for the vertical axis. * print-X-axis:: Print a horizontal label. @@ -1023,7 +1023,7 @@ the command in parentheses, like this: @kbd{M-C-\} invoke the command; this is called @dfn{rebinding}. @xref{Keymaps, , Keymaps}.) The abbreviation @kbd{M-C-\} means that you type your @key{META} key, @key{CTRL} key and @key{\} key all at the same time. -(On many modern keyboards the @key{META} key is labelled +(On many modern keyboards the @key{META} key is labeled @key{ALT}.) Sometimes a combination like this is called a keychord, since it is similar to the way you play a chord on a piano. If your keyboard does @@ -1031,7 +1031,7 @@ not have a @key{META} key, the @key{ESC} key prefix is used in place of it. In this case, @kbd{M-C-\} means that you press and release your @key{ESC} key and then type the @key{CTRL} key and the @key{\} key at the same time. But usually @kbd{M-C-\} means press the @key{CTRL} key -along with the key that is labelled @key{ALT} and, at the same time, +along with the key that is labeled @key{ALT} and, at the same time, press the @key{\} key. In addition to typing a lone keychord, you can prefix what you type @@ -4749,7 +4749,7 @@ type in the name of the function whose source code you want to see, such as @code{mark-whole-buffer}, and then type @key{RET}. Emacs will switch buffers and display the source code for the function on your screen. To switch back to your current buffer, type @kbd{C-x b -@key{RET}}. (On some keyboards, the @key{META} key is labelled +@key{RET}}. (On some keyboards, the @key{META} key is labeled @key{ALT}.) @c !!! 22.1.1 tags table location in this paragraph @@ -8200,7 +8200,7 @@ The command \\[yank] can retrieve it from there. @dots{} " ;; it will be set in an error (setq this-command 'kill-region) ;; Finally, in the then-part, send a message if you may copy - ;; the text to the kill ring without signally an error, but + ;; the text to the kill ring without signaling an error, but ;; don't if you may not. @end group @group @@ -13656,7 +13656,7 @@ list of supported languages. The @code{etags} program handles more than 20 languages, including Emacs Lisp, Common Lisp, Scheme, C, C++, Ada, Fortran, HTML, Java, -LaTeX, Pascal, Perl, Postscript, Python, TeX, Texinfo, makefiles, and +LaTeX, Pascal, Perl, PostScript, Python, TeX, Texinfo, makefiles, and most assemblers. The program has no switches for specifying the language; it recognizes the language in an input file according to its file name and contents. @@ -16962,7 +16962,7 @@ For this reason, I have written enhancements to the basic @code{print-graph-body} function that automatically print labels for the horizontal and vertical axes. Since the label printing functions do not contain much new material, I have placed their description in -an appendix. @xref{Full Graph, , A Graph with Labelled Axes}. +an appendix. @xref{Full Graph, , A Graph with Labeled Axes}. @node Line Graph Exercise, , Printed Axes, Readying a Graph @section Exercise @@ -19447,7 +19447,7 @@ whether the kill ring is full or empty. This is an act of exploration. From the human point of view, the act of exploration and discovery is -not necessarily an error, and therefore should not be labelled as one, +not necessarily an error, and therefore should not be labeled as one, even in the bowels of a computer. As it is, the code in Emacs implies that a human who is acting virtuously, by exploring his or her environment, is making an error. This is bad. Even though the computer @@ -19760,25 +19760,25 @@ as @code{kill-ring-yank-pointer} do not use this library, possibly because they were written earlier. @node Full Graph, Free Software and Free Manuals, Kill Ring, Top -@appendix A Graph with Labelled Axes +@appendix A Graph with Labeled Axes Printed axes help you understand a graph. They convey scale. In an earlier chapter (@pxref{Readying a Graph, , Readying a Graph}), we wrote the code to print the body of a graph. Here we write the code -for printing and labelling vertical and horizontal axes, along with the +for printing and labeling vertical and horizontal axes, along with the body itself. @menu -* Labelled Example:: +* Labeled Example:: * print-graph Varlist:: @code{let} expression in @code{print-graph}. * print-Y-axis:: Print a label for the vertical axis. * print-X-axis:: Print a horizontal label. * Print Whole Graph:: The function to print a complete graph. @end menu -@node Labelled Example, print-graph Varlist, Full Graph, Full Graph +@node Labeled Example, print-graph Varlist, Full Graph, Full Graph @ifnottex -@unnumberedsec Labelled Example Graph +@unnumberedsec Labeled Example Graph @end ifnottex Since insertions fill a buffer to the right and below point, the new @@ -19821,9 +19821,9 @@ Here is an example of how a finished graph should look: @end smallexample @noindent -In this graph, both the vertical and the horizontal axes are labelled +In this graph, both the vertical and the horizontal axes are labeled with numbers. However, in some graphs, the horizontal axis is time -and would be better labelled with months, like this: +and would be better labeled with months, like this: @smallexample @group @@ -19838,9 +19838,9 @@ and would be better labelled with months, like this: @end smallexample Indeed, with a little thought, we can easily come up with a variety of -vertical and horizontal labelling schemes. Our task could become +vertical and horizontal labeling schemes. Our task could become complicated. But complications breed confusion. Rather than permit -this, it is better choose a simple labelling scheme for our first +this, it is better choose a simple labeling scheme for our first effort, and to modify or replace it later. @need 1200 @@ -19864,7 +19864,7 @@ These considerations suggest the following outline for the We can work on each part of the @code{print-graph} function definition in turn. -@node print-graph Varlist, print-Y-axis, Labelled Example, Full Graph +@node print-graph Varlist, print-Y-axis, Labeled Example, Full Graph @comment node-name, next, previous, up @appendixsec The @code{print-graph} Varlist @cindex @code{print-graph} varlist @@ -20391,7 +20391,7 @@ blank spaces and also separated according to the value of the variable The value of the variable @code{X-axis-label-spacing} should itself be measured in units of @code{symbol-width}, since you may want to change the width of the symbols that you are using to print the body of the -graph without changing the ways the graph is labelled. +graph without changing the ways the graph is labeled. @menu * Similarities differences:: Much like @code{print-Y-axis}, but not exactly. @@ -20722,7 +20722,7 @@ Emacs will print the horizontal axis like this: Now we are nearly ready to print the whole graph. The function to print the graph with the proper labels follows the -outline we created earlier (@pxref{Full Graph, , A Graph with Labelled +outline we created earlier (@pxref{Full Graph, , A Graph with Labeled Axes}), but with additions. @need 1250 @@ -20857,7 +20857,7 @@ Finally, the code for the @code{print-graph} function: ;;; @r{Final version.} (defun print-graph (numbers-list &optional vertical-step) - "Print labelled bar graph of the NUMBERS-LIST. + "Print labeled bar graph of the NUMBERS-LIST. The numbers-list consists of the Y-axis values. @end group @@ -21478,7 +21478,7 @@ each column." @group (defun print-graph (numbers-list &optional vertical-step horizontal-step) - "Print labelled bar graph of the NUMBERS-LIST. + "Print labeled bar graph of the NUMBERS-LIST. The numbers-list consists of the Y-axis values. @end group @@ -21979,7 +21979,7 @@ each column." @group (defun print-graph (numbers-list &optional vertical-step horizontal-step) - "Print labelled bar graph of the NUMBERS-LIST. + "Print labeled bar graph of the NUMBERS-LIST. The numbers-list consists of the Y-axis values. @end group @@ -22275,4 +22275,3 @@ airplane. @c @end iftex @bye - diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 1e86e07998c..0fa50492481 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,82 @@ +2011-11-17 Martin Rudalics <rudalics@gmx.at> + + * windows.texi (Resizing Windows, Splitting Windows) + (Deleting Windows): Use term window-combination-resize instead + of window-splits. + +2011-11-16 Martin Rudalics <rudalics@gmx.at> + + * windows.texi (Resizing Windows, Splitting Windows): Rename + occurrences of window-nest to window-combination-limit. + +2011-11-14 Juanma Barranquero <lekktu@gmail.com> + + * intro.texi (Lisp History): Fix typo. + +2011-11-12 Martin Rudalics <rudalics@gmx.at> + + * windows.texi (Splitting Windows, Deleting Windows): Remove + references to splits status of windows. + +2011-11-10 Glenn Morris <rgm@gnu.org> + + * buffers.texi (Read Only Buffers): Expand a bit on why + toggle-read-only should only be used interactively. (Bug#7292) + +2011-11-09 Chong Yidong <cyd@gnu.org> + + * windows.texi (Window Sizes): Document window-pixel-edges, + window-inside-pixel-edges, window-absolute-pixel-edges, and + window-inside-absolute-pixel-edges. + (Resizing Windows): shrink-window-if-larger-than-buffer works on + non-full-width windows. + +2011-11-09 Martin Rudalics <rudalics@gmx.at> + + * windows.texi (Resizing Windows): Rewrite documentation of + window-resizable. + +2011-11-09 Chong Yidong <cyd@gnu.org> + + * windows.texi (Splitting Windows): Simplify example. + +2011-11-08 Chong Yidong <cyd@gnu.org> + + * windows.texi (Window Sizes): Copyedits. Document + window-text-height. Remove window-min-height and window-min-width + discussion, referring instead to Emacs manual. + (Splitting Windows, Resizing Windows): Add xref to Emacs manual. + (Resizing Windows): Simplify introduction. Don't document + enlarge-window, shrink-window, enlarge-window-horizontally, and + shrink-window-horizontally; they are no longer preferred for + calling from Lisp, and are already documented in the Emacs manual. + +2011-11-07 Glenn Morris <rgm@gnu.org> + + * windows.texi (Choosing Window): Fix keybinding typo. + +2011-11-07 Martin Rudalics <rudalics@gmx.at> + + * windows.texi (Resizing Windows, Splitting Windows) + (Window Configurations): Use "child window" instead of + "subwindow". + +2011-11-06 Chong Yidong <cyd@gnu.org> + + * windows.texi (Basic Windows): Clarify various definitions. + Treat window-normalize-* as internal; don't document them. + (Windows and Frames): Various clarifications, e.g. non-live + windows also belong to frames. Fix window-list description. + Simplify window nesting example. + (Splitting Windows, Window Configurations): Use + split-window-below. + +2011-11-04 Eli Zaretskii <eliz@gnu.org> + + * windows.texi (Window Sizes): Mention in the doc string that the + return values of `window-body-height' and `window-body-width' are + in frame's canonical units. (Bug#9949) + 2011-10-30 Martin Rudalics <rudalics@gmx.at> * windows.texi (Windows and Frames): Remove "iso-" infix from @@ -1048,9 +1127,9 @@ * commands.texi (Misc Events): Add cross-references to where POSITION of a mouse event is described in detail. -2010-08-08 Christoph <cschol2112@googlemail.com> +2010-08-08 Christoph Scholtes <cschol2112@googlemail.com> - * control.texi (Handling Errors) <error-message-string>: Fix arg name. + * control.texi (Handling Errors) <error-message-string>: Fix arg name. 2010-08-08 Juanma Barranquero <lekktu@gmail.com> diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 816d0f9faa8..ee2ce2e2001 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -748,10 +748,11 @@ of the list (comparison is done with @code{eq}). @deffn Command toggle-read-only &optional arg This command toggles whether the current buffer is read-only. It is -intended for interactive use; do not use it in programs. At any given -point in a program, you should know whether you want the read-only flag -on or off; so you can set @code{buffer-read-only} explicitly to the -proper value, @code{t} or @code{nil}. +intended for interactive use; do not use it in programs (it may have +side-effects, such as enabling View mode, and does not affect +read-only text properties). To change the read-only state of a buffer in +a program, explicitly set @code{buffer-read-only} to the proper value. +To temporarily ignore a read-only state, bind @code{inhibit-read-only}. If @var{arg} is non-@code{nil}, it should be a raw prefix argument. @code{toggle-read-only} sets @code{buffer-read-only} to @code{t} if diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 71b612c527d..86ecfd122ef 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -2827,7 +2827,7 @@ If @code{file-remote-p} returns the same identifier for two different filenames, that means they are stored on the same file system and can be accessed locally with respect to each other. This means, for example, that it is possible to start a remote process accessing both -files at the same time. Implementors of file handlers need to ensure +files at the same time. Implementers of file handlers need to ensure this principle is valid. @var{identification} specifies which part of the identifier shall be diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index d9399e98a69..d2e86a77112 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -2414,7 +2414,7 @@ This function returns the ``vendor'' that provided the X server software (as a string). Really this means whoever distributes the X server. -When the developers of X labelled software distributors as +When the developers of X labeled software distributors as ``vendors,'' they showed their false assumption that no system could ever be developed and distributed noncommercially. @end defun @@ -2430,4 +2430,3 @@ This variable's value is @code{t} if no X window manager is in use. The functions @code{x-pixel-width} and @code{x-pixel-height} return the width and height of an X Window frame, measured in pixels. @end ignore - diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 5cdd983f40d..0168c564e34 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -887,7 +887,7 @@ known to be unchanged since the last complete redisplay. @item unchanged_modified @itemx overlay_unchanged_modified The values of @code{modiff} and @code{overlay_modiff}, respectively, -after the last compelete redisplay. If their current values match +after the last complete redisplay. If their current values match @code{modiff} or @code{overlay_modiff}, that means @code{beg_unchanged} and @code{end_unchanged} contain no useful information. diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi index 7c070726023..44ac947fa99 100644 --- a/doc/lispref/intro.texi +++ b/doc/lispref/intro.texi @@ -101,7 +101,7 @@ for other purposes as well, such as writing editing commands. Dozens of Lisp implementations have been built over the years, each with its own idiosyncrasies. Many of them were inspired by Maclisp, which was written in the 1960s at MIT's Project MAC. Eventually the -implementors of the descendants of Maclisp came together and developed a +implementers of the descendants of Maclisp came together and developed a standard for Lisp systems, called Common Lisp. In the meantime, Gerry Sussman and Guy Steele at MIT developed a simplified but very powerful dialect of Lisp, called Scheme. diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index d4f8ee9708b..51d91572d0e 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -420,7 +420,7 @@ remote files. Per default, this variable is always set to @code{t}, meaning that a call of @code{process-file} could potentially change any file on a remote host. When set to @code{nil}, a file handler could optimize -its behaviour with respect to remote file attributes caching. +its behavior with respect to remote file attributes caching. This variable should never be changed by @code{setq}. Instead of, it shall be set only by let-binding. diff --git a/doc/lispref/spellfile b/doc/lispref/spellfile index b373d00bebf..e66dcc88f71 100644 --- a/doc/lispref/spellfile +++ b/doc/lispref/spellfile @@ -240,7 +240,7 @@ correct' counterintuitive cr creatable -customie +customize deactivate deactivated deassigns @@ -331,7 +331,6 @@ for' formfeed forms' forw -forwa found' frob from' diff --git a/doc/lispref/two-volume-cross-refs.txt b/doc/lispref/two-volume-cross-refs.txt index 99b48d342ab..53a9f58cd01 100644 --- a/doc/lispref/two-volume-cross-refs.txt +++ b/doc/lispref/two-volume-cross-refs.txt @@ -87,7 +87,7 @@ to create elisp2-aux-vol-added insert elisp2-aux-vol-added into vol1.aux (append) insert elisp1-aux-vol-added into vol2.aux (prepend) -(so you dont have to do it again) +(so you don't have to do it again) % cp vol1.aux elisp1-aux-ready % cp vol2.aux elisp2-aux-ready @@ -120,7 +120,7 @@ Be sure that .fn file has no blank lines. % texindex vol1.fn % texindex vol2.fn -(so you dont have to do it again) +(so you don't have to do it again) % cp vol1.fns elisp1-fns-2vol-ready % cp vol2.fns elisp2-fns-2vol-ready diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 37679aa4a0b..8c99a06909b 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -50,216 +50,188 @@ is displayed in windows. @section Basic Concepts of Emacs Windows @cindex window -A @dfn{window} in Emacs is the physical area of the screen in which a -buffer is displayed, see @ref{Buffers}. The term is also used to refer -to a Lisp object that represents that screen area in Emacs Lisp. It -should be clear from the context which is meant. +A @dfn{window} is a area of the screen which is used to display a +buffer (@pxref{Buffers}). In Emacs Lisp, windows are represented by a +special Lisp object type. @cindex multiple windows - Emacs groups windows into frames; see @ref{Frames}. Each frame always -contains at least one window, but you can subdivide it into multiple, -non-overlapping Emacs windows. Users create multiple windows so they -can look at several buffers at once. Lisp libraries use multiple -windows for a variety of reasons, but most often to display related -information. In Rmail, for example, you can move through a summary -buffer in one window while the other window shows messages one at a time -as they are reached. + Windows are grouped into frames (@pxref{Frames}). Each frame +contains at least one window; the user can subdivide it into multiple, +non-overlapping windows to view several buffers at once. Lisp +programs can use multiple windows for a variety of purposes. In +Rmail, for example, you can view a summary of message titles in one +window, and the contents of the selected message in another window. @cindex terminal screen @cindex screen of terminal - The meaning of ``window'' in Emacs is similar to what it means in the -context of general-purpose window systems such as X, but not identical. -The X Window System places X windows on the screen; Emacs uses one or -more X windows as frames, and subdivides them into Emacs windows. When -you use Emacs on a character-only terminal, Emacs treats the whole -terminal screen as one frame. + Emacs uses the word ``window'' with a different meaning than in +graphical desktop environments and window systems, such as the X +Window System. When Emacs is run on X, each of its graphical X +windows is an Emacs frame (containing one or more Emacs windows). +When Emacs is run on a text-only terminal, the frame fills the entire +terminal screen. @cindex tiled windows - Most window systems support arbitrarily located overlapping windows. -In contrast, Emacs windows are @dfn{tiled}; they never overlap, and -together they fill the whole screen or frame. Because of the way in -which Emacs creates new windows (@pxref{Splitting Windows}) and resizes -them (@pxref{Resizing Windows}), not all conceivable tilings of windows -on an Emacs frame are actually possible. - - For practical purposes, a window exists only while it is displayed in -a frame. Once removed from the frame, the window is effectively deleted -and should not be used, even though the Lisp object representing it -might be still referenced from other Lisp objects; see @ref{Deleting -Windows}. Restoring a saved window configuration is the only way for a -window no longer on the screen to come back to life; see @ref{Window -Configurations}. - -@defun windowp object -This function returns @code{t} if @var{object} is a window, @code{nil} -otherwise. It can return @code{t} if @var{object} denotes a window that -has been deleted. -@end defun + Unlike X windows, Emacs windows are @dfn{tiled}; they never overlap +within the area of the frame. When a window is created, resized, or +deleted, the change in window space is taken from or given to the +adjacent windows, so that the total area of the frame is unchanged. @cindex live windows @cindex internal windows - For historical reasons a window is considered @dfn{live} if and only -if it currently displays a buffer; see @ref{Buffers and Windows}. In -order to show multiple windows within one and the same frame, Emacs -organizes them in form of a tree called window tree; see @ref{Windows -and Frames}. The internal nodes of a window tree are called internal -windows and are not considered live. The leaf nodes of a window tree -constitute the windows displaying buffers and only they will be called -live here. + A @dfn{live window} is one that is actually displaying a buffer in a +frame. Such a window can be @dfn{deleted}, i.e. removed from the +frame (@pxref{Deleting Windows}); then it is no longer live, but the +Lisp object representing it might be still referenced from other Lisp +objects. A deleted window may be brought back to life by restoring a +saved window configuration (@pxref{Window Configurations}). + +@defun windowp object +This function returns @code{t} if @var{object} is a window (whether or +not it is live). Otherwise, it returns @code{nil}. +@end defun @defun window-live-p object This function returns @code{t} if @var{object} is a live window and -@code{nil} otherwise. A live window is a window that displays a buffer. +@code{nil} otherwise. A live window is one that displays a buffer. @end defun -@defun window-any-p object -This function returns @code{t} if @var{object} denotes a live or an -internal window and @code{nil} otherwise. In particular, this function -returns @code{nil} if @var{object} is a window that has been -deleted. + The windows in each frame are organized into a @dfn{window tree}. +@xref{Windows and Frames}. The leaf nodes of each window tree are +live windows---the ones actually displaying buffers. The internal +nodes of the window tree are internal windows, which are not live. +You can distinguish internal windows from deleted windows with +@code{window-valid-p}. + +@defun window-valid-p object +This function returns @code{t} if @var{object} is a live window, or an +internal window in a window tree. Otherwise, it returns @code{nil}, +including for the case where @var{object} is a deleted window. @end defun @cindex selected window -In each frame, at any time, one and only one window is designated as -@dfn{selected within the frame}. Also, at any time, one frame is the -selected frame (@pxref{Input Focus}). The window selected within the -selected frame is the @dfn{selected window}. - - The selected window is always a live window. Its buffer is usually -the current buffer (except when @code{set-buffer} has been used); see -@ref{Current Buffer}. + In each frame, at any time, exactly one Emacs window is designated +as @dfn{selected within the frame}. For the selected frame, that +window is called the @dfn{selected window}---the one in which most +editing takes place, and in which the cursor for selected windows +appears (@pxref{Cursor Parameters}). The selected window's buffer is +usually also the current buffer, except when @code{set-buffer} has +been used (@pxref{Current Buffer}). As for non-selected frames, the +window selected within the frame becomes the selected window if the +frame is ever selected. @xref{Selecting Windows}. @defun selected-window -This function returns the selected window. This is the window in which -the cursor for selected windows (@pxref{Cursor Parameters}) appears and -to which many commands apply. -@end defun - -The window handling functions can be roughly grouped into functions -operating on live windows only and functions that accept any window as -argument. Many of these functions accept as argument the value -@code{nil} to specify the selected window. The two functions below can -be used to ``normalize'' arguments specifying windows in a uniform -manner. - -@defun window-normalize-any-window window -This function returns the normalized value for @var{window} which can be -any window that has not been deleted. More precisely, if @var{window} -is @code{nil}, it returns the selected window. If @var{window} denotes -a live or internal window, it returns that window. Otherwise, this -function signals an error. -@end defun - -@defun window-normalize-live-window window -This functions returns the normalized value for a live window -@var{window}. More precisely, if @var{window} is @code{nil}, it returns -the selected window. If @var{window} is a live window, it returns that -window. Otherwise, this function signals an error. +This function returns the selected window (which is always a live +window). @end defun - @node Windows and Frames @section Windows and Frames -Each window is part of one and only one frame (@pxref{Frames}); you can -get that frame with the function described next. +Each window belongs to exactly one frame (@pxref{Frames}). @defun window-frame window -This function returns the frame that @var{window} is on. The argument -@var{window} can be any window and defaults to the selected one. +This function returns the frame that the window @var{window} belongs +to. If @var{window} is @code{nil}, it defaults to the selected +window. @end defun -The following function returns a list of all live windows on a specific -frame. +@defun window-list &optional frame minibuffer window +This function returns a list of live windows belonging to the frame +@var{frame}. If @var{frame} is omitted or @code{nil}, it defaults to +the selected frame. -@defun window-list &optional frame minibuf window -This function returns a list of @var{frame}'s live windows, starting -with @var{window}. The optional argument @var{frame} has to denote a -live frame and defaults to the selected frame. The optional argument -@var{window} has to denote a live window on the frame specified by -@var{frame} and defaults to the selected one. +The optional argument @var{minibuffer} specifies whether to include +the minibuffer window in the returned list. If @var{minibuffer} is +@code{t}, the minibuffer window is included. If @var{minibuffer} is +@code{nil} or omitted, the minibuffer window is included only if it is +active. If @var{minibuffer} is neither @code{nil} nor @code{t}, the +minibuffer window is never included. -The argument @var{minibuf} specifies if the minibuffer window shall be -included in the return value. If @var{minibuf} is @code{t}, the result -always includes the minibuffer window. If @var{minibuf} is @code{nil} -or omitted, that includes the minibuffer window only if it is active. -If @var{minibuf} is neither @code{nil} nor @code{t}, the result never -includes the minibuffer window. +The optional argument @var{window}, if non-@code{nil}, should be a +live window on the specified frame; then @var{window} will be the +first element in the returned list. If @var{window} is omitted or +@code{nil}, the window selected within the frame is first element. @end defun @cindex window tree -Windows within one and the same frame are organized in form of a tree -called @dfn{window tree}. The leaf nodes of a window tree constitute -the windows visible to the user. These are the windows associated with -buffers and are usually called live windows. The internal nodes of a -window tree are needed for finding, traversing and displaying the live -windows. - - A minibuffer window (@pxref{Minibuffer Windows}) is not considered -part of its frame's window tree unless the frame is a minibuffer-only -frame. Most functions covered in this section accept, however, the -minibuffer window as argument. Also, the minibuffer window is listed by -the function @code{window-tree} described at the end of this section. - - A window tree is rooted at the root window of its frame. +@cindex root window + Windows in the same frame are organized into a @dfn{window tree}, +whose leaf nodes are the live windows. The internal nodes of a window +tree are not live; they exist for the purpose of organizing the +relationships between live windows. The root node of a window tree is +called the @dfn{root window}. It can be either a live window (if the +frame has just one window), or an internal window. + + A minibuffer window (@pxref{Minibuffer Windows}) is not part of its +frame's window tree unless the frame is a minibuffer-only frame. +Nonetheless, most of the functions in this section accept the +minibuffer window as an argument. Also, the function +@code{window-tree} described at the end of this section lists the +minibuffer window alongside the actual window tree. @defun frame-root-window &optional frame-or-window -This function returns the root window of @var{frame-or-window}. The -argument @var{frame-or-window} has to denote either a window or a frame -and defaults to the selected frame. If @var{frame-or-window} denotes a -window, the return value is the root window of that window's frame. -This function always returns a window; a live window if the frame -specified by @var{frame-or-window} contains no other live windows and an -internal window otherwise. +This function returns the root window for @var{frame-or-window}. The +argument @var{frame-or-window} should be either a window or a frame; +if omitted or @code{nil}, it defaults to the selected frame. If +@var{frame-or-window} is a window, the return value is the root window +of that window's frame. @end defun -@cindex subwindow -All other windows of a frame with the exception of the minibuffer window -are subwindows of the frame's root window. A window is considered a -@dfn{subwindow} of another window if it occupies a part of that other -window's screen area. - -The functions described next allow to access the members of a window -tree and take an arbitrary window as argument. +@cindex parent window +@cindex child window +@cindex sibling window + When a window is split, there are two live windows where previously +there was one. One of these is represented by the same Lisp window +object as the original window, and the other is represented by a +newly-created Lisp window object. Both of these live windows become +leaf nodes of the window tree, as @dfn{child windows} of a single +internal window. If necessary, Emacs automatically creates this +internal window, which is also called the @dfn{parent window}, and +assigns it to the appropriate position in the window tree. A set of +windows that share the same parent are called @dfn{siblings}. @cindex parent window @defun window-parent &optional window -Return @var{window}'s parent in the window tree. The optional argument -@var{window} can denote an arbitrary window and defaults to the selected -one. The return value is @code{nil} if @var{window} is a minibuffer -window or the root window of its frame and an internal window otherwise. +This function returns the parent window of @var{window}. If +@var{window} is omitted or @code{nil}, it defaults to the selected +window. The return value is @code{nil} if @var{window} has no parent +(i.e. it is a minibuffer window or the root window of its frame). @end defun -@cindex child window - Parent windows do not appear on the screen. The screen area of a -parent window is the rectangular part of the window's frame occupied by -the window's @dfn{child windows}, that is, the set of windows having -that window as their parent. Each parent window has at least two child -windows, so there are no ``Matryoshka'' windows. Minibuffer windows do -not have child windows. + Each internal window always has at least two child windows. If this +number falls to one as a result of window deletion, Emacs +automatically deletes the internal window, and its sole remaining +child window takes its place in the window tree. + + Each child window can be either a live window, or an internal window +(which in turn would have its own child windows). Therefore, each +internal window can be thought of as occupying a certain rectangular +@dfn{screen area}---the union of the areas occupied by the live +windows that are ultimately descended from it. @cindex window combination @cindex vertical combination @cindex horizontal combination -The children of any parent window form either a vertical or a horizontal -combination of windows. A @dfn{vertical combination} is a set of -windows arranged one above each other. A @dfn{horizontal combination} -is a set of windows arranged side by side. Consider the frame shown -below (for simplicity we assume that the frame does not contain a -minibuffer window): + For each internal window, the screen areas of the immediate children +are arranged either vertically or horizontally (never both). If the +child windows are arranged one above the other, they are said to form +a @dfn{vertical combination}; if they are arranged side by side, they +are said to form a @dfn{horizontal combination}. Consider the +following example: @smallexample @group ______________________________________ | ______ ____________________________ | || || __________________________ || - || ||| ___________ ___________ ||| - || |||| || |||| - || |||| || |||| - || ||||_____W6____||_____W7____|||| + || ||| ||| + || ||| ||| + || ||| ||| || |||____________W4____________||| || || __________________________ || || ||| ||| + || ||| ||| || |||____________W5____________||| ||__W2__||_____________W3_____________ | |__________________W1__________________| @@ -267,91 +239,70 @@ minibuffer window): @end group @end smallexample -The root window of the frame is @code{W1}---a horizontal combination of -the live window @code{W2} and the internal window @code{W3}. Hence -@code{(window-parent W1)} is @code{nil} while @code{(window-parent W2)} -and @code{(window-parent W3)} are both @code{W1}. - - The internal window @code{W3} is a vertical combination of @code{W4} -and the live window @code{W5}. The internal window @code{W4} is a -horizontal combination of the live windows @code{W6} and @code{W7}. The -windows you can actually see on the screen are @code{W2}, @code{W5}, -@code{W6} and @code{W7}. - - For any parent window, the first child window can be retrieved by the -functions given next. - -@defun window-top-child &optional window -This function returns @var{window}'s first vertical child window. The -optional argument @var{window} can be an arbitrary window and defaults -to the selected one. The return value is @code{nil} if @var{window} is -a live window or its children form a horizontal combination. In the -example above @code{(window-top-child W3)} is @code{W4} while -@code{(window-top-child W4)} is @code{nil}. +@noindent +The root window of this frame is an internal window, @code{W1}. Its +child windows form a horizontal combination, consisting of the live +window @code{W2} and the internal window @code{W3}. The child windows +of @code{W3} form a vertical combination, consisting of the live +windows @code{W4} and @code{W5}. Hence, the live windows in this +window tree are @code{W2} @code{W4}, and @code{W5}. + + The following functions can be used to retrieve a child window of an +internal window, and the siblings of a child window. + +@defun window-top-child window +This function returns the topmost child window of @var{window}, if +@var{window} is an internal window whose children form a vertical +combination. For any other type of window, the return value is +@code{nil}. @end defun -@defun window-left-child &optional window -This function returns @var{window}'s first horizontal child window. The -optional argument @var{window} can be an arbitrary window and defaults -to the selected one. The return value is @code{nil} if @var{window} is -a live window or its children form a vertical combination. In the -example above @code{(window-left-child W4)} is @code{W6} while -@code{(window-left-child W3)} is @code{nil}. +@defun window-left-child window +This function returns the leftmost child window of @var{window}, if +@var{window} is an internal window whose children form a horizontal +combination. For any other type of window, the return value is +@code{nil}. @end defun @defun window-child window -This function return @var{window}'s first child window. The return -value is @code{nil} if @var{window} is a live window. In the example -above @code{(window-child W3)} is @code{W4} while @code{(window-child -W4)} is @code{W6}. +This function returns the first child window of the internal window +@var{window}---the topmost child window for a vertical combination, or +the leftmost child window for a horizontal combination. If +@var{window} is a live window, the return value is @code{nil}. @end defun -The following function is useful to determine whether a window is part -of a vertical or horizontal combination. - @defun window-combined-p &optional window horizontal -This function returns non-@code{nil} if and only if @var{window} is -vertically combined. The argument @var{window} can specify any window -and defaults to the selected one. The actual return value is the first -vertical child of window. +This function returns a non-@code{nil} value if and only if +@var{window} is part of a vertical combination. If @var{window} is +omitted or @code{nil}, it defaults to the selected one. -If the optional argument @var{horizontal} is non-@code{nil}, this means -to return non-@code{nil} if and only if @var{window} is horizontally -combined. In this case, the return value is the first horizontal child -of window. +If the optional argument @var{horizontal} is non-@code{nil}, this +means to return non-@code{nil} if and only if @var{window} is part of +a horizontal combination. @end defun -@cindex sibling window -For any window that is part of a combination, the other windows in that -combination are called the window's @dfn{siblings}. The only windows -that do not have siblings are root windows of frames and minibuffer -windows. A window's siblings can be retrieved with the following two -functions. - @defun window-next-sibling &optional window -This function returns @var{window}'s next sibling. The optional -argument @var{window} can be an arbitrary window and defaults to the -selected window. It returns @code{nil} if @var{window} is the last -child of its parent. In our example @code{(window-next-sibling W2)} is -@code{W3} while @code{(window-next-sibling W3)} is @code{nil}. +This function returns the next sibling of the window @var{window}. If +omitted or @code{nil}, @var{window} defaults to the selected window. +The return value is @code{nil} if @var{window} is the last child of +its parent. @end defun @defun window-prev-sibling &optional window -This function returns @var{window}'s previous sibling. The optional -argument @var{window} can be an arbitrary window and defaults to the -selected window. It returns @code{nil} if @var{window} is the first -child of its parent. In our example @code{(window-prev-sibling W3)} is -@code{W2} and @code{(window-prev-sibling W2)} is @code{nil}. +This function returns the previous sibling of the window @var{window}. +If omitted or @code{nil}, @var{window} defaults to the selected +window. The return value is @code{nil} if @var{window} is the first +child of its parent. @end defun -The functions @code{window-next-sibling} and @code{window-prev-sibling} -should not be confused with the functions @code{next-window} and -@code{previous-window} which respectively return the next and previous -window in the cyclic ordering of windows, see @ref{Cyclic Window -Ordering}. +The functions @code{window-next-sibling} and +@code{window-prev-sibling} should not be confused with the functions +@code{next-window} and @code{previous-window} which respectively +return the next and previous window in the cyclic ordering of windows +(@pxref{Cyclic Window Ordering}). - In order to find the first live window on a frame, the following -function can be used. + You can use the following functions to find the first live window on +a frame, and to retrieve the entire window tree of a frame: @defun frame-first-window &optional frame-or-window This function returns the live window at the upper left corner of the @@ -363,43 +314,38 @@ the assumption that the frame from our canonical example is selected @code{(frame-first-window)} returns @code{W2}. @end defun -You can get the window tree of a frame with the following function. - -@cindex window tree @defun window-tree &optional frame -This function returns the window tree for frame @var{frame}. The -optional argument @var{frame} must be a live frame and defaults to the -selected one. +This function returns a list representing the window tree for frame +@var{frame}. If @var{frame} is omitted or @code{nil}, it defaults to +the selected frame. The return value is a list of the form @code{(@var{root} @var{mini})}, -where @var{root} represents the window tree of the frame's -root window, and @var{mini} is the frame's minibuffer window. +where @var{root} represents the window tree of the frame's root +window, and @var{mini} is the frame's minibuffer window. -If the root window is live, @var{root} specifies the root window and -nothing else. Otherwise, @var{root} is a list @code{(@var{dir} -@var{edges} @var{w1} @var{w2} ...)} where @var{dir} is @code{nil} for a -horizontal combination, and @code{t} for a vertical combination, -@var{edges} gives the size and position of the combination, and the -remaining elements are the child windows. Each child window may again -be a live window or a list representing a window combination, and so on. -The @var{edges} element is a list @code{(@var{left}@var{ top}@var{ -right}@var{ bottom})} similar to the value returned by -@code{window-edges}, see @ref{Coordinates and Windows}. +If the root window is live, @var{root} is that window itself. +Otherwise, @var{root} is a list @code{(@var{dir} @var{edges} @var{w1} +@var{w2} ...)} where @var{dir} is @code{nil} for a horizontal +combination and @code{t} for a vertical combination, @var{edges} gives +the size and position of the combination, and the remaining elements +are the child windows. Each child window may again be a window object +(for a live window) or a list with the same format as above (for an +internal window). The @var{edges} element is a list @code{(@var{left} +@var{top} @var{right} @var{bottom})}, similar to the value returned by +@code{window-edges} (@pxref{Coordinates and Windows}). @end defun - @node Window Sizes @section Window Sizes @cindex window size @cindex size of window -Emacs windows are rectangular. The structure of a live window can be -roughly sketched as follows: + The following schematic shows the structure of a live window: @smallexample @group - _________________________________________ - ^ |______________ Header Line_______________| + _________________________________________ + ^ |______________ Header Line_______________| | |LS|LF|LM| |RM|RF|RS| ^ | | | | | | | | | | Window | | | | Text Area | | | | Window @@ -415,287 +361,218 @@ roughly sketched as follows: @end smallexample @cindex window body +@cindex text area of a window @cindex body of a window -The text area constitutes the body of the window. In its most simple -form, a window consists of its body alone. LS and RS stand for the left -and right scroll bar (@pxref{Scroll Bars}) respectively. Only one of -them can be present at any time. LF and RF denote the left and right -fringe, see @ref{Fringes}. LM and RM, finally, stand for the left and -right display margin, see @ref{Display Margins}. The header line, if -present, is located above theses areas, the mode line below, see -@ref{Mode Line Format}. + At the center of the window is the @dfn{text area}, or @dfn{body}, +where the buffer text is displayed. On each side of the text area is +a series of vertical areas; from innermost to outermost, these are the +left and right margins, denoted by LM and RM in the schematic +(@pxref{Display Margins}); the left and right fringes, denoted by LF +and RF (@pxref{Fringes}); and the left or right scroll bar, only one of +which is present at any time, denoted by LS and RS (@pxref{Scroll +Bars}). At the top of the window is an optional header line +(@pxref{Header Lines}), and at the bottom of the window is the mode +line (@pxref{Mode Line Format}). + + Emacs provides several functions for finding the height and width of +a window. Except where noted, these heights and widths are reported +as integer numbers of lines and columns respectively. On a graphical +display, each ``line'' and ``column'' actually corresponds to the +height and width of a ``default'' character specified by the frame's +default font. Thus, if a window is displaying text with a different +font or size, the reported height and width for that window may differ +from the actual number of text lines or columns displayed within it. @cindex window height -@cindex total window height @cindex height of a window @cindex total height of a window -The @dfn{total height of a window} is specified as the total number of -lines occupied by the window. Any mode or header line is included in a -window's total height. For an internal window, the total height is -calculated recursively from the total heights of its child windows. - @cindex window width -@cindex total window width @cindex width of a window @cindex total width of a window -The @dfn{total width of a window} denotes the total number of columns of -the window. Any scroll bar and the column of @samp{|} characters that -separate the window from its right sibling are included in a window's -total width. On a window-system, fringes and display margins are -included in a window's total width too. For an internal window, the -total width is calculated recursively from the total widths of its child -windows. - -@cindex total size of a window -@cindex total window size -The following function is the standard interface for getting the total -size of any window: - -@defun window-total-size &optional window &optional horizontal -This function returns the total number of lines of @var{window}. The -argument @var{window} can denote any window and defaults to the selected -one. If @var{window} is live, the return value includes any header or -mode lines of @var{window}. If @var{window} is internal, the return -value is the sum of the total heights of @var{window}'s child windows -provided these are vertically combined and the height of @var{window}'s -first child if they are horizontally combined. - - If the optional argument @var{horizontal} is non-@code{nil}, this -function returns the total number of columns of @var{window}. If -@var{window} is live, the return value includes any vertical divider -column or scroll bars of @var{window}. On a window-system, the return -value includes the space occupied by any margins and fringes of -@var{window} too. If @var{window} is internal, the return value is the -sum of the total widths of @var{window}'s child windows provided these -are horizontally combined and the width of @var{window}'s first child -otherwise. -@end defun - -Alternatively, the following two functions can be used to retrieve -either the total height or the total width of a window: + The @dfn{total height} of a window is the distance between the top +and bottom of the window, including the header line (if one exists) +and the mode line. The @dfn{total width} of a window is the distance +between the left and right edges of the mode line. Note that the +height of a frame is not the same as the height of its windows, since +a frame may also contain an echo area, menu bar, and tool bar +(@pxref{Size and Position}). @defun window-total-height &optional window -This function returns the total number of lines of @var{window}. -@var{window} can be any window and defaults to the selected one. The -return value includes @var{window}'s mode line and header line, if any. -If @var{window} is internal the return value is the sum of heights of -@var{window}'s child windows for a vertical combination and the height -of @var{window}'s first child otherwise. +This function returns the total height, in lines, of the window +@var{window}. If @var{window} is omitted or @code{nil}, it defaults +to the selected window. If @var{window} is an internal window, the +return value is the total height occupied by its descendant windows. @end defun @defun window-total-width &optional window -This function returns the total number of columns of @var{window}. -@var{window} can be any window and defaults to the selected one. The -return value includes any vertical dividers or scrollbars of -@var{window}. On a window-system the return value also includes the -space occupied by any margins and fringes of @var{window}. If -@var{window} is internal, the return value is the sum of the widths of -@var{window}'s child windows for a horizontal combination and the width -of @var{window}'s first child otherwise. -@end defun - -The total height of any window is usually less than the height of the -window's frame, because the latter may also include the minibuffer -window. Depending on the toolkit in use, the frame height can also -include the menu bar and the tool bar (@pxref{Size and Position}). -Therefore, in general it is not straightforward to compare window and -frame heights. The following function is useful to determine whether -there are no other windows above or below a specified window. +This function returns the total width, in columns, of the window +@var{window}. If @var{window} is omitted or @code{nil}, it defaults +to the selected window. If @var{window} is internal, the return value +is the total width occupied by its descendant windows. +@end defun -@cindex full-height window -@defun window-full-height-p &optional window -This function returns non-@code{nil} if there is no other window above -or below @var{window} on the containing frame. More precisely, this -function returns @code{t} if and only if the total height of -@var{window} equals the total height of the root window (@pxref{Windows -and Frames}) of @var{window}'s frame. The @var{window} argument may -denote any window and defaults to the selected one. +@defun window-total-size &optional window horizontal +This function returns either the total height or width of the window +@var{window}. If @var{horizontal} is omitted or @code{nil}, this is +equivalent to calling @code{window-total-height} for @var{window}; +otherwise it is equivalent to calling @code{window-total-width} for +@var{window}. @end defun @cindex full-width window -The following function can be used to determine whether there are no -other windows on the left or right of a specified window. +@cindex full-height window + The following functions can be used to determine whether a given +window has any adjacent windows. + +@defun window-full-height-p &optional window +This function returns non-@code{nil} if @var{window} has no other +window above or below it in its frame, i.e. its total height equals +the total height of the root window on that frame. If @var{window} is +omitted or @code{nil}, it defaults to the selected window. +@end defun @defun window-full-width-p &optional window -This function returns non-@code{nil} if there are no other windows on -the left or right of @var{window}; @code{nil} otherwise. More -precisely, this function returns @code{t} if and only if the total width -of @var{window} equals the total width of the root window -(@pxref{Windows and Frames}) of @var{window}'s frame. The @var{window} -argument may denote any window and defaults to the selected one. +This function returns non-@code{nil} if @var{window} has no other +window to the left or right in its frame, i.e. its total width equals +that of the root window on that frame. If @var{window} is omitted or +@code{nil}, it defaults to the selected window. @end defun -@cindex top line of window -@cindex left column of window - The windows of a frame are unambiguously characterized by the -combination of their top line and left column within that frame. +@cindex window position + The following functions can be used to determine the position of a +window relative to the window area of its frame: @defun window-top-line &optional window -This function returns the top line of @var{window}. The argument -@var{window} can denote any window and defaults to the selected one. +This function returns the distance, in lines, between the top of +@var{window} and the top of the frame's window area. For instance, +the return value is 0 if there is no window above @var{window}. If +@var{window} is omitted or @code{nil}, it defaults to the selected +window. @end defun @defun window-left-column &optional window -This function returns the left column of @var{window}. The argument -@var{window} can denote any window and defaults to the selected one. +This function returns the distance, in columns, between the left edge +of @var{window} and the left edge of the frame's window area. For +instance, the return value is 0 if there is no window to the left of +@var{window}. If @var{window} is omitted or @code{nil}, it defaults +to the selected window. @end defun -For a frame displaying one window only, that window's top line and left -column are both zero. When a frame displays a window @var{WB} below a -window @var{WA}, the top line of @var{WB} can be calculated by adding -the total height of @var{WA} to the top line of @var{WA}. When a frame -displays a window @var{WR} on the right of a window @var{WL}, the left -column of @var{WR} can be calculated by adding the total width of -@var{WL} to the left column of @var{WL}. - @cindex window body height @cindex body height of a window -The @dfn{body height of a window} is specified as the total number of -lines occupied by the window's text area. Mode or header lines are not -included in a window's body height. - @cindex window body width @cindex body width of a window -The @dfn{body width of a window} denotes the total number of columns -occupied by the window's text area. Scroll bars or columns of @samp{|} -characters that separate side-by-side windows are not included in a -window's body width. - @cindex body size of a window @cindex window body size -The following functions retrieve height and width of the body of a live -window: - -@defun window-body-size &optional window horizontal -This function returns the number of lines of @var{window}'s text area. -@var{window} must be a live window and defaults to the selected one. -The return value does not count any mode or header line of @var{window}. - -Optional argument @var{horizontal} non-@code{nil} means to return the -number of columns of @var{window}'s text area. In this case the return -value does not include any vertical divider or scroll bar owned by -@var{window}. On a window-system the return value does not include the -number of columns used for @var{window}'s fringes or display margins -either. -@end defun + The @dfn{body height} of a window is the height of its text area, +which does not include the mode or header line. Similarly, the +@dfn{body width} is the width of the text area, which does not include +the scroll bar, fringes, or margins. @defun window-body-height &optional window -This function returns the number of lines of @var{window}'s body. -@var{window} must be a live window and defaults to the selected one. +This function returns the body height, in lines, of the window +@var{window}. If @var{window} is omitted or @code{nil}, it defaults +to the selected window; otherwise it must be a live window. -The return value does not include @var{window}'s mode line and header -line, if any. If a line at the bottom of the window is only partially -visible, that line is included in the return value. If you do not -want to include a partially visible bottom line in the return value, -use @code{window-text-height} instead. +If there is a partially-visible line at the bottom of the text area, +that counts as a whole line; to exclude such a partially-visible line, +use @code{window-text-height}, below. @end defun @defun window-body-width &optional window -This function returns the number of columns of @var{window}'s body. -@var{window} must be a live window and defaults to the selected one. - -The return value does not include any vertical dividers or scroll bars -owned by @var{window}. On a window-system the return value does not -include the number of columns used for @var{window}'s fringes or -display margins either. +This function returns the body width, in columns, of the window +@var{window}. If @var{window} is omitted or @code{nil}, it defaults +to the selected window; otherwise it must be a live window. @end defun -The following functions have been used in earlier versions of Emacs. -They are still supported but due to the confusing nomenclature they -should not be used any more in future code. - -@defun window-height &optional window -This function is an alias for `window-total-height', see above. +@defun window-body-size &optional window horizontal +This function returns the body height or body width of @var{window}. +If @var{horizontal} is omitted or @code{nil}, it is equivalent to +calling @code{window-body-height} for @var{window}; otherwise it is +equivalent to calling @code{window-body-width}. @end defun -@defun window-width &optional window -This function is an alias for `window-body-width', see above. +@defun window-text-height &optional window +This function is like @code{window-body-height}, except that any +partially-visible line at the bottom of the text area is not counted. @end defun -@cindex minimum window size - The following two options constrain the sizes of windows to a minimum -height and width. Their values are honored when windows are split -(@pxref{Splitting Windows}) or resized (@pxref{Resizing Windows}). Any -request to make a window smaller than specified here will usually result -in an error. - -@defopt window-min-height -The value of this variable specifies how short a window may be. The -value is measured in line units and has to account for any header or -mode line. The default value for this option is @code{4}. Values less -than @code{1} are ignored. -@end defopt - -@defopt window-min-width -The value of this variable specifies how narrow a window may be. The -value is measured in characters and includes any margins, fringes, -scroll bar and vertical divider column. The default value for this -option is @code{10}. A value less than @code{2} is ignored. -@end defopt - -Applications should not rebind these variables. To shrink a specific -window to a height or width less than the one specified here, they -should rather invoke @code{window-resize} (@pxref{Resizing Windows}) -with a non-@code{nil} @var{ignore} argument. The function -@code{split-window} (@pxref{Splitting Windows}) can make a window -smaller than specified here by calling it with a non-@code{nil} -@var{size} argument. Interactively, the values specified here cannot be -overridden. - - Earlier versions of Emacs could delete a window when its size dropped -below @code{window-min-height} or @code{window-min-width}. As a rule, -the current version of Emacs does no more delete windows by side-effect. -The only exception to this rule are requests to resize a frame which may -implicitly delete windows when they do not fit on the frame any more, -see @ref{Size and Position}. - - The size of a window can be fixed which means that it cannot be split -(@pxref{Splitting Windows}) or resized (@pxref{Resizing Windows}). + For compatibility with previous versions of Emacs, +@code{window-height} is an alias for @code{window-body-height}, and +@code{window-width} is an alias for @code{window-body-width}. These +aliases are considered obsolete and will be removed in the future. @cindex fixed-size window + Commands that change the size of windows (@pxref{Resizing Windows}), +or split them (@pxref{Splitting Windows}), obey the variables +@code{window-min-height} and @code{window-min-width}, which specify +the smallest allowable window height and width. @xref{Change +Window,,Deleting and Rearranging Windows, emacs, The GNU Emacs +Manual}. They also obey the variable @code{window-size-fixed}, with +which a window can be @dfn{fixed} in size: + @defvar window-size-fixed -If this variable is non-@code{nil}, in a given buffer, then the size of -any window displaying that buffer remains fixed unless you either -explicitly change it or Emacs has no other choice. +If this buffer-local variable is non-@code{nil}, the size of any +window displaying the buffer cannot normally be changed. Deleting a +window or changing the frame's size may still change its size, if +there is no choice. If the value is @code{height}, then only the window's height is fixed; if the value is @code{width}, then only the window's width is fixed. Any other non-@code{nil} value fixes both the width and the height. - -This variable automatically becomes buffer-local when set. @end defvar -Commands supposed to explicitly change the size of windows such as -@code{enlarge-window} (@pxref{Resizing Windows}) get an error if they -had to change a window size which is fixed. Other functions like -@code{window-resize} (@pxref{Resizing Windows}) have an optional -@var{ignore} argument which allows to change the size of fixed-size -windows. +@defun window-size-fixed-p &optional window horizontal +This function returns a non-@code{nil} value if @var{window}'s height +is fixed. If @var{window} is omitted or @code{nil}, it defaults to +the selected window. If the optional argument @var{horizontal} is +non-@code{nil}, the return value is non-@code{nil} if @var{window}'s +width is fixed. + +A @code{nil} return value does not necessarily mean that @var{window} +can be resized in the desired direction. To determine that, use the +function @code{window-resizable}. @xref{Resizing Windows}. +@end defun - Deleting a window or changing a frame's size may change the size of a -fixed-size window, if there is no other alternative. + The following functions can be used to find a window's size and +position in pixels. Though mostly useful on graphical displays, they +can also be called on text-only terminals, where the screen area of +each text character is taken to be ``one pixel''. - The height of a vertical combination of windows cannot be changed -when the height of all these windows is fixed. Its width cannot be -changed if the width of at least one of these windows is fixed. -Similarly, the width of a horizontal combination of windows cannot be -changed when the width of all these windows is fixed. Its height cannot -be changed if the height of at least one of these windows is fixed. +@defun window-pixel-edges &optional window +This function return a list of pixel coordinates for the edges of +@var{window}. If @var{window} is omitted or @code{nil}, it defaults +to the selected window. - The next function allows to check whether the size of an arbitrary -window is fixed. +The return value has the form @code{(@var{left} @var{top} @var{right} +@var{bottom})}. The list elements are, respectively, the X coordinate +of the left window edge, the Y coordinate of the top edge, one more +than the X coordinate of the right edge, and one more than the Y +coordinate of the bottom edge. The origin coordinate @samp{(0,0)} is +taken to be the top left corner of the frame's window area. -@defun window-size-fixed-p &optional window horizontal -This function returns non-@code{nil} if @var{window}'s height is fixed. -The argument @var{window} can be an arbitrary window and defaults to the -selected one. Optional argument @var{horizontal} non-@code{nil} means -return non-@code{nil} if @var{window}'s width is fixed. +These edge values include the space used by the window's scroll bar, +margins, fringes, header line, and mode line, if any. +@end defun -If this function returns @code{nil}, this does not necessarily mean that -@var{window} can be resized in the desired direction. The function -@code{window-resizable} (@pxref{Resizing Windows}) can tell that. +@defun window-inside-pixel-edges &optional window +This function is like @code{window-pixel-edges}, except that it +returns the edge coordinates for the window's text area, rather than +the edge coordinates for the window itself. @var{window} must specify +a live window. @end defun +@defun window-absolute-pixel-edges &optional window +This function is like @code{window-pixel-edges}, except that it +returns the edge coordinates relative to the top left corner of the +display screen. +@end defun + +@defun window-inside-absolute-pixel-edges &optional window +This function is like @code{window-inside-pixel-edges}, except that it +returns the edge coordinates relative to the top left corner of the +display screen. @var{window} must specify a live window. +@end defun @node Resizing Windows @section Resizing Windows @@ -704,231 +581,148 @@ If this function returns @code{nil}, this does not necessarily mean that @cindex changing window size @cindex window size, changing -Emacs does not permit overlapping windows or gaps between windows, so -changing the size of a window always affects at least one other window. -When a frame contains just one window, that window can be resized only -by resizing the window's frame. The functions described below are -therefore meaningful only in the context of a frame containing at least -two windows. The size of the corresponding frame never changes when -invoking a function described in this section. - - The routines changing window sizes always operate in one dimension at -a time. This means that windows can be resized only either vertically -or horizontally. If a window shall be resized in both dimensions, it -must be resized in one dimension first and in the other dimension -afterwards. If the second resize operation fails, the frame might end -up in an unsatisfactory state. To avoid such states, it might be useful -to save the current window configuration (@pxref{Window Configurations}) -before attempting the first resize operation and restore the saved -configuration in case the second resize operation fails. - - Functions that resize windows are supposed to obey restrictions -imposed by window minimum sizes and fixed-size windows, see @ref{Window -Sizes}. In order to determine whether resizing a specific window is -possible in the first place, the following function can be used: - -@defun window-resizable window delta &optional horizontal ignore side noup nodown + This section describes functions for resizing a window without +changing the size of its frame. Because live windows do not overlap, +these functions are meaningful only on frames that contain two or more +windows: resizing a window also changes the size of a neighboring +window. If there is just one window on a frame, its size cannot be +changed except by resizing the frame (@pxref{Size and Position}). + + Except where noted, these functions also accept internal windows as +arguments. Resizing an internal window causes its child windows to be +resized to fit the same space. + +@defun window-resizable window delta &optional horizontal ignore This function returns @var{delta} if the size of @var{window} can be -changed vertically by @var{delta} lines. Optional argument -@var{horizontal} non-@code{nil} means to return @var{delta} if -@var{window} can be resized horizontally by @var{delta} columns. A -return value of zero means that @var{window} is not resizable. - -If @var{delta} is a positive number, this means that @var{window} shall -be enlarged by @var{delta} lines or columns. If @var{window} cannot be -enlarged by @var{delta} lines or columns, this function returns the -maximum value in the range from 0 to @var{delta} by which @var{window} -can be enlarged. - -If @var{delta} is a negative number, this means that @var{window} shall -be shrunk by -@var{delta} lines or columns. If @var{window} cannot be -shrunk by -@var{delta} lines or columns, this function returns the -minimum value in the range from @var{delta} to 0 that can be used for -shrinking @var{window}. - -Optional argument @var{ignore} non-@code{nil} means ignore any -restrictions imposed by the variables @code{window-min-height} or -@code{window-min-width} and @code{window-size-fixed}. In this case the -minimum height of a window is specified as the minimum number of lines -that allow viewing any header or mode line and at least one line of the -text area of window. The minimum width of a window includes any -fringes, margins and the scroll bar as well as two text columns. - -If @var{ignore} denotes a window, this means to ignore restrictions for -that window only. If @var{ignore} equals the constant @code{safe}, this -means a live window may get as small as one line or two columns. - -Optional argument @var{noup} non-@code{nil} means don't go up in the -window tree but try to steal or distribute the space needed for the -resize operation among the other windows within @var{window}'s -combination. Optional argument @var{nodown} non-@code{nil} means don't -check whether @var{window} itself and its subwindows can be resized. -@end defun - -The function @code{window-resizable} does not change any window sizes. -The following function does: +changed vertically by @var{delta} lines. If the optional argument +@var{horizontal} is non-@code{nil}, it instead returns @var{delta} if +@var{window} can be resized horizontally by @var{delta} columns. It +does not actually change the window size. + +If @var{window} is @code{nil}, it defaults to the selected window. + +A positive value of @var{delta} means to check whether the window can be +enlarged by that number of lines or columns; a negative value of +@var{delta} means to check whether the window can be shrunk by that many +lines or columns. If @var{delta} is non-zero, a return value of 0 means +that the window cannot be resized. + +Normally, the variables @code{window-min-height} and +@code{window-min-width} specify the smallest allowable window size. +@xref{Change Window,, Deleting and Rearranging Windows, emacs, The GNU +Emacs Manual}. However, if the optional argument @var{ignore} is +non-@code{nil}, this function ignores @code{window-min-height} and +@code{window-min-width}, as well as @code{window-size-fixed}. +Instead, it considers the minimum-height window to be one consisting +of a header (if any), a mode line, plus a text area one line tall; and +a minimum-width window as one consisting of fringes, margins, and +scroll bar (if any), plus a text area two columns wide. +@end defun @defun window-resize window delta &optional horizontal ignore -This function resizes @var{window} vertically by @var{delta} lines. The -argument @var{window} can denote an arbitrary window and defaults to the -selected one. An attempt to resize the root window of a frame will -raise an error. - -Second argument @var{delta} a positive number means @var{window} shall -be enlarged by @var{delta} lines. If @var{delta} is negative, that -means @var{window} shall be shrunk by -@var{delta} lines. - -Optional argument @var{horizontal} non-@code{nil} means to resize -@var{window} horizontally by @var{delta} columns. In this case a -positive @var{delta} means enlarge @var{window} by @var{delta} columns. -A negative @var{delta} means @var{window} shall be shrunk by --@var{delta} columns. - -Optional argument @var{ignore} has the same meaning as for the function -@code{window-resizable} above. - -This function can simultaneously move two edges of WINDOW. Exactly -which edges of @var{window} are moved and which other windows are -resized along with @var{window} is determined by the splits and nest -status of the involved windows (@pxref{Splitting Windows}). If only the -low (right) edge of @var{window} shall be moved, the function -@code{adjust-window-trailing-edge} described below should be used. -@end defun - -The next four commands are simple interfaces to @code{window-resize}. -They always operate on the selected window, never delete any window, and -always raise an error when resizing would violate a restriction imposed -by @code{window-min-height}, @code{window-min-width}, or -@code{window-size-fixed}. - -@deffn Command enlarge-window delta &optional horizontal -This function makes the selected window @var{delta} lines taller. -Interactively, if no argument is given, it makes the selected window one -line taller. If optional argument @var{horizontal} is non-@code{nil}, -it makes the selected window wider by @var{delta} columns. If -@var{delta} is negative, it shrinks the selected window by -@var{delta} -lines or columns. The return value is @code{nil}. -@end deffn +This function resizes @var{window} by @var{delta} increments. If +@var{horizontal} is @code{nil}, it changes the height by @var{delta} +lines; otherwise, it changes the width by @var{delta} columns. A +positive @var{delta} means to enlarge the window, and a negative +@var{delta} means to shrink it. -@deffn Command enlarge-window-horizontally delta -This function makes the selected window @var{delta} columns wider. -Interactively, if no argument is given, it makes the selected window one -column wider. -@end deffn +If @var{window} is @code{nil}, it defaults to the selected window. If +the window cannot be resized as demanded, an error is signaled. -@deffn Command shrink-window delta &optional horizontal -This function makes the selected window @var{delta} lines smaller. -Interactively, if no argument is given, it makes the selected window one -line smaller. If optional argument @var{horizontal} is non-@code{nil}, -it makes the selected window narrower by @var{delta} columns. If -@var{delta} is negative, it enlarges the selected window by -@var{delta} -lines or columns. The return value is @code{nil}. -@end deffn +The optional argument @var{ignore} has the same meaning as for the +function @code{window-resizable} above. -@deffn Command shrink-window-horizontally delta -This function makes the selected window @var{delta} columns narrower. -Interactively, if no argument is given, it makes the selected window one -column narrower. -@end deffn +The choice of which window edges this function alters depends on the +values of the option @code{window-combination-resize} and the +combination-limit status of the involved windows; in some cases, it may +alter both edges. @xref{Splitting Windows}. To resize by moving only +the bottom or right edge of a window, use the function +@code{adjust-window-trailing-edge}, below. +@end defun -The following function is useful for moving the line dividing two -windows. +@c The commands enlarge-window, enlarge-window-horizontally, +@c shrink-window, and shrink-window-horizontally are documented in the +@c Emacs manual. They are not preferred for calling from Lisp. @defun adjust-window-trailing-edge window delta &optional horizontal This function moves @var{window}'s bottom edge by @var{delta} lines. -Optional argument @var{horizontal} non-@code{nil} means to move -@var{window}'s right edge by @var{delta} columns. The argument -@var{window} defaults to the selected window. +If optional argument @var{horizontal} is non-@code{nil}, it instead +moves the right edge by @var{delta} columns. If @var{window} is +@code{nil}, it defaults to the selected window. -If @var{delta} is greater zero, this moves the edge downwards or to the -right. If @var{delta} is less than zero, this moves the edge upwards or -to the left. If the edge can't be moved by @var{delta} lines or columns, -it is moved as far as possible in the desired direction but no error is -signalled. +A positive @var{delta} moves the edge downwards or to the right; a +negative @var{delta} moves it upwards or to the left. If the edge +cannot be moved as far as specified by @var{delta}, this function +moves it as far as possible but does not signal a error. This function tries to resize windows adjacent to the edge that is -moved. Only if this is insufficient, it will also resize windows not -adjacent to that edge. As a consequence, if you move an edge in one -direction and back in the other direction by the same amount, the -resulting window configuration will not be necessarily identical to the -one before the first move. So if your intend to just resize -@var{window}, you should not use this function but call -@code{window-resize} (see above) instead. +moved. If this is not possible for some reason (e.g. if that adjacent +window is fixed-size), it may resize other windows. @end defun + The following commands resize windows in more specific ways. When +called interactively, they act on the selected window. + @deffn Command fit-window-to-buffer &optional window max-height min-height override -This command makes @var{window} the right height to display its -contents exactly. The default for @var{window} is the selected window. - -The optional argument @var{max-height} specifies the maximum total -height the window is allowed to be; @code{nil} means use the maximum -permissible height of a window on @var{window}'s frame. The optional -argument @var{min-height} specifies the minimum toatl height for the -window; @code{nil} means use @code{window-min-height}. All these height -values include the mode line and/or header line. - -If the optional argument @var{override} is non-@code{nil}, this means to -ignore any restrictions imposed by @code{window-min-height} and -@code{window-min-width} on the size of @var{window}. - -This function returns non-@code{nil} if it orderly resized @var{window}, -and @code{nil} otherwise. +This command adjusts the height of @var{window} to fit the text in it. +It returns non-@code{nil} if it was able to resize @var{window}, and +@code{nil} otherwise. If @var{window} is omitted or @code{nil}, it +defaults to the selected window. Otherwise, it should be a live +window. + +The optional argument @var{max-height}, if non-@code{nil}, specifies +the maximum total height that this function can give @var{window}. +The optional argument @var{min-height}, if no-@code{nil}, specifies +the minimum total height that it can give, which overrides the +variable @code{window-min-height}. + +If the optional argument @var{override} is non-@code{nil}, this +function ignores any size restrictions imposed by +@code{window-min-height} and @code{window-min-width}. @end deffn @deffn Command shrink-window-if-larger-than-buffer &optional window -This command shrinks @var{window} vertically to be as small as possible -while still showing the full contents of its buffer---but not less than -@code{window-min-height} lines. The argument @var{window} must denote -a live window and defaults to the selected one. - -However, this command does nothing if the window is already too small to -display the whole text of the buffer, or if part of the contents are -currently scrolled off screen, or if the window is not the full width of -its frame, or if the window is the only window in its frame. - -This command returns non-@code{nil} if it actually shrank the window -and @code{nil} otherwise. +This command attempts to reduce @var{window}'s height as much as +possible while still showing its full buffer, but no less than +@code{window-min-height} lines. The return value is non-@code{nil} if +the window was resized, and @code{nil} otherwise. If @var{window} is +omitted or @code{nil}, it defaults to the selected window. Otherwise, +it should be a live window. + +This command does nothing if the window is already too short to +display all of its buffer, or if any of the buffer is scrolled +off-screen, or if the window is the only live window in its frame. @end deffn @cindex balancing window sizes -Emacs provides two functions to balance windows, that is, to even out -the sizes of all windows on the same frame. The minibuffer window and -fixed-size windows are not resized by these functions. - @deffn Command balance-windows &optional window-or-frame This function balances windows in a way that gives more space to full-width and/or full-height windows. If @var{window-or-frame} specifies a frame, it balances all windows on that frame. If -@var{window-or-frame} specifies a window, it balances that window and -its siblings (@pxref{Windows and Frames}) only. +@var{window-or-frame} specifies a window, it balances only that window +and its siblings (@pxref{Windows and Frames}). @end deffn @deffn Command balance-windows-area This function attempts to give all windows on the selected frame -approximately the same share of the screen area. This means that -full-width or full-height windows are not given more space than other -windows. +approximately the same share of the screen area. Full-width or +full-height windows are not given more space than other windows. @end deffn @cindex maximizing windows -The following function can be used to give a window the maximum possible -size without deleting other ones. - @deffn Command maximize-window &optional window -This function maximizes @var{window}. More precisely, this makes -@var{window} as large as possible without resizing its frame or deleting -other windows. @var{window} can be any window and defaults to the -selected one. +This function attempts to make @var{window} as large as possible, in +both dimensions, without resizing its frame or deleting other windows. +If @var{window} is omitted or @code{nil}, it defaults to the selected +window. @end deffn @cindex minimizing windows -To make a window as small as possible without deleting it the -following function can be used. - @deffn Command minimize-window &optional window -This function minimizes @var{window}. More precisely, this makes -@var{window} as small as possible without deleting it or resizing its -frame. @var{window} can be any window and defaults to the selected one. +This function attempts to make @var{window} as small as possible, in +both dimensions, without deleting it or resizing its frame. If +@var{window} is omitted or @code{nil}, it defaults to the selected +window. @end deffn @@ -937,222 +731,66 @@ frame. @var{window} can be any window and defaults to the selected one. @cindex splitting windows @cindex window splitting -The functions described below are the primitives needed for creating a -new window. They do not accept a buffer as an argument. Rather, they -``split'' an existing window into two halves, both displaying the buffer -previously visible in the window that was split. +This section describes functions for creating a new window by +@dfn{splitting} an existing one. @deffn Command split-window &optional window size side -This function creates a new window adjacent to @var{window}. It returns -the new window which is always a live window. The argument @var{window} -can denote any window and defaults to the selected one. This function -does not change the selected window. - -Optional second argument @var{size} a positive number means make -@var{window} @var{size} lines (or columns) tall. If @var{size} is -negative, make the new window @minus{}@var{size} lines (or columns) -tall. If @var{size} is omitted or @code{nil}, then @var{window} is -divided evenly into two parts. (If there is an odd line, it is -allocated to the new window.) - -If splitting would result in making a window smaller than -@code{window-min-height} or @code{window-min-width} (@pxref{Window -Sizes}), this function usually signals an error. However, if @var{size} -is non-@code{nil} and valid, a new window of the requested size is -created. (A size value would be invalid if it assigned less than one -line or less than two columns to the new window.) - -Optional third argument @var{side} @code{nil} (or @code{below}) -specifies that the new window shall be located below @var{window}. The -value @code{above} means the new window will be located above -@var{window}. In both cases @var{size} specifies the new number of -lines for @var{window} (or the new window if @var{size} is negative) -including space reserved for the mode and/or header line. - -If @var{side} is @code{t} or @code{right} the new window will be -positioned on the right side of @var{window}. The value @code{left} -means the new window will be located on the left side of @var{window}. -In both cases @var{size} specifies the new number of columns for -@var{window} (or the new window provided @var{size} is negative) -including space reserved for margins, fringes and the scroll bar or a -divider column. - -Any other non-@code{nil} value for @var{side} is currently handled like -@code{t} (or @code{right}). Since this might change in the future, -application programs should refrain from using other values. - -If @var{window} is live, properties of the new window like margins and -scroll bars are inherited from @var{window}. If @var{window} is an -internal window, these properties, as well as the buffer shown in the -new window, are inherited from the window selected on @var{window}'s -frame. - -If @code{ignore-window-parameters} is non-@code{nil}, this function -ignores window parameters (@pxref{Window Parameters}). Otherwise, if -the @code{split-window} parameter of @var{window} is @code{t}, it splits -the window disregarding any other window parameters. If the -@code{split-window} parameter specifies a function, that function is -called with the arguments @var{window}, @var{size}, and @var{side} to -split @var{window}. If that function is @code{ignore}, nothing is done. +This function creates a new live window next to the window +@var{window}. If @var{window} is omitted or @code{nil}, it defaults +to the selected window. That window is ``split'', and reduced in +size. The space is taken up by the new window, which is returned. + +The optional second argument @var{size} determines the sizes of +@var{window} and/or the new window. If it is omitted or @code{nil}, +both windows are given equal sizes; if there is an odd line, it is +allocated to the new window. If @var{size} is a positive number, +@var{window} is given @var{size} lines (or columns, depending on the +value of @var{side}). If @var{size} is a negative number, the new +window is given @minus{}@var{size} lines (or columns). + +If @var{size} is @code{nil}, this function obeys the variables +@code{window-min-height} and @code{window-min-width}. @xref{Change +Window,,Deleting and Rearranging Windows, emacs, The GNU Emacs +Manual}. Thus, it signals an error if splitting would result in +making a window smaller than those variables specify. However, a +non-@code{nil} value for @var{size} causes those variables to be +ignored; in that case, the smallest allowable window is considered to +be one that has space for a text area one line tall and/or two columns +wide. + +The optional third argument @var{side} determines the position of the +new window relative to @var{window}. If it is @code{nil} or +@code{below}, the new window is placed below @var{window}. If it is +@code{above}, the new window is placed above @var{window}. In both +these cases, @var{size} specifies a total window height, in lines. + +If @var{side} is @code{t} or @code{right}, the new window is placed on +the right of @var{window}. If @var{side} is @code{left}, the new +window is placed on the left of @var{window}. In both these cases, +@var{size} specifies a total window width, in columns. + +If @var{window} is a live window, the new window inherits various +properties from it, including margins and scroll bars. If +@var{window} is an internal window, the new window inherits the +properties of the window selected within @var{window}'s frame. + +If the variable @code{ignore-window-parameters} is non-@code{nil} +(@pxref{Window Parameters}), this function ignores window parameters. +Otherwise, it consults the @code{split-window} parameter of +@var{window}; if this is @code{t}, it splits the window disregarding +any other window parameters. If the @code{split-window} parameter +specifies a function, that function is called with the arguments +@var{window}, @var{size}, and @var{side} to split @var{window}, in +lieu of the usual action of @code{split-window}. @end deffn -The following example starts with one window on a screen that is 50 -lines high by 80 columns wide; then it splits the window. - -@smallexample -@group -(setq W1 (selected-window)) - @result{} #<window 8 on windows.texi> -(setq W2 (split-window W1 15)) - @result{} #<window 28 on windows.texi> -@end group -@group -(window-top-line W1) - @result{} 0 -(window-total-size W1) - @result{} 15 -(window-top-line W2) - @result{} 15 -@end group -@end smallexample - -The screen looks like this: - -@smallexample -@group - __________ - | | line 0 - | W1 | - |__________| - | | line 15 - | W2 | - |__________| - line 50 - column 0 column 80 -@end group -@end smallexample - -Next, split the top window into two side-by-side windows: - -@smallexample -@group -(setq W3 (split-window W1 35 t)) - @result{} #<window 32 on windows.texi> -@end group -@group -(window-left-column W1) - @result{} 0 -(window-total-size W1 t) - @result{} 35 -(window-left-column W3) - @result{} 35 -@end group -@end smallexample - -@need 3000 -Now the screen looks like this: - -@smallexample -@group - column 35 - __________ - | | | line 0 - | W1 | W3 | - |____|_____| - | | line 15 - | W2 | - |__________| - line 50 - column 0 column 80 -@end group -@end smallexample - -Normally, Emacs indicates the border between two side-by-side windows -with a scroll bar (@pxref{Scroll Bars}), or with @samp{|} characters. The -display table can specify alternative border characters; see @ref{Display -Tables}. - -Below we describe how @code{split-window} can be used to create the -window configuration from our earlier example (@pxref{Windows and -Frames}) and how internal windows are created for this purpose. We -start with a frame containing one live window @code{W2} (in the -following scenarios window names are assigned in an arbitrary manner in -order to match the names of the example). Evaluating the form -@code{(split-window W2 8 t)} creates a new internal window @code{W1} -with two children---@code{W2} (the window we've split) and a new leaf -window @code{W6}: -@smallexample -@group - ______________________________________ - | ______ ____________________________ | - || || || - || || || - || || || - || || || - || || || - || || || - || || || - || || || - || || || - || || || - ||__W2__||_____________W6_____________ | - |__________________W1__________________| - -@end group -@end smallexample - -Evaluating now @code{(split-window W6 -3)} creates another internal -window @code{W3} with two children---@code{W6} and a new live window -@code{W5}. This leaves us with a vertically combined window @code{W3} -embedded in the horizontally combined window @code{W1}: -@smallexample -@group - ______________________________________ - | ______ ____________________________ | - || || __________________________ || - || ||| ||| - || ||| ||| - || ||| ||| - || ||| ||| - || ||| ||| - || |||____________W6____________||| - || || __________________________ || - || ||| ||| - || |||____________W5____________||| - ||__W2__||_____________W3_____________ | - |__________________W1__________________| - -@end group -@end smallexample + As an example, we show a combination of @code{split-window} calls +that yields the window configuration discussed in @ref{Windows and +Frames}. This example demonstrates splitting a live window as well as +splitting an internal window. We begin with a frame containing a +single window (a live root window), which we denote by @var{W4}. +Calling @code{(split-window W3)} yields this window configuration: -Finally, evaluating @code{(split-window W6 nil t)} should get us the -desired configuration as depicted below. -@smallexample -@group - ______________________________________ - | ______ ____________________________ | - || || __________________________ || - || ||| ___________ ___________ ||| - || |||| || |||| - || |||| || |||| - || ||||_____W6____||_____W7____|||| - || |||____________W4____________||| - || || __________________________ || - || ||| ||| - || |||____________W5____________||| - ||__W2__||_____________W3_____________ | - |__________________W1__________________| - -@end group -@end smallexample - -The scenario sketched above is the standard way to obtain the desired -configuration. In Emacs 23 it was also the only way to do that since -Emacs 23 did't allow splitting internal windows. - -With Emacs 24 you can also proceed as follows: Split an initial window -@code{W6} by evaluating @code{(split-window W6 -3)} to produce the -following vertical combination: @smallexample @group ______________________________________ @@ -1160,152 +798,74 @@ following vertical combination: || || || || || || + ||_________________W4_________________|| + | ____________________________________ | || || || || || || - || || - ||_________________W6_________________|| - | ____________________________________ | - || || ||_________________W5_________________|| |__________________W3__________________| @end group @end smallexample -Evaluating now @code{(split-window (window-parent W6) -8 'left)} or, -equivalently, @code{(split-window W3 -8 'left)} should now produce the -penultimate configuration from the previous scenario from where we can -continue as described before. - - Another strategy starts with splitting an initial window @code{W6} by -evaluating @code{(split-window W6 nil nil t)} with the following result: -@smallexample -@group - ______________________________________ - | _________________ _________________ | - || || || - || || || - || || || - || || || - || || || - || || || - || || || - || || || - || || || - || || || - ||________W6_______||________W7_______|| - |__________________W4__________________| - -@end group -@end smallexample - -Evaluating now @code{(split-window W4 -3)} or @code{(split-window -(window-parent W6) -3)} should get us a configuration as shown next. -@smallexample -@group - ______________________________________ - | ____________________________________ | - || ________________ ________________ || - ||| || ||| - ||| || ||| - ||| || ||| - ||| || ||| - ||| || ||| - |||_______W6_______||________W7______||| - ||_________________W4_________________|| - | ____________________________________ | - || || - ||_________________W5_________________|| - |__________________W3__________________| - -@end group -@end smallexample +@noindent +The @code{split-window} call has created a new live window, denoted by +@var{W5}. It has also created a new internal window, denoted by +@var{W3}, which becomes the root window and the parent of both +@var{W4} and @var{W5}. -The desired configuration can be now obtained by evaluating -@code{(split-window W3 -8 'left)} or, equivalently, @code{(split-window -(window-parent W5) -8 'left)}. + Next, we call @code{(split-window W3 nil 'left)}, passing the +internal window @var{W3} as the argument. The result: - For a final approach let's start with the configuration of two live -windows @code{W6} and @code{W7} shown above. If we now evaluate -@code{(split-window W4 -8 'left)} or @code{(split-window (window-parent -W6) -8 'left)} we get the following configuration. @smallexample @group ______________________________________ | ______ ____________________________ | - || || ____________ ____________ || - || ||| || ||| - || ||| || ||| - || ||| || ||| - || ||| || ||| - || ||| || ||| - || ||| || ||| - || ||| || ||| - || |||______W6____||______W7____||| - ||__W2__||_____________W4_____________|| + || || __________________________ || + || ||| ||| + || ||| ||| + || ||| ||| + || |||____________W4____________||| + || || __________________________ || + || ||| ||| + || ||| ||| + || |||____________W5____________||| + ||__W2__||_____________W3_____________ | |__________________W1__________________| - @end group @end smallexample -Evaluating now @code{(split-window W4 -3)} or, for example, -@code{(split-window (window-parent W6) -3)} should produce the desired -configuration. +@noindent +A new live window @var{W2} is created, to the left of the internal +window @var{W3}. A new internal window @var{W1} is created, becoming +the new root window. - The two options described next can be used to tune the operation of + The following two options can be used to modify the operation of @code{split-window}. -@defopt window-splits -If this variable is nil, the function @code{split-window} can split a -window if and only if that window's screen estate is sufficiently large -to accommodate both--itself and the new window. - -If this variable is non-@code{nil}, @code{split-window} tries to resize -all windows that are part of the same combination as the old window to -accommodate the new window. Hence, the new window can be also created if -the old window is of fixed size or too small to split (@pxref{Window -Sizes}). - -In any case, the value of this variable is assigned to the splits status -of the new window and, provided old and new window form a new -combination, of the old window as well. The splits status of a window -can be retrieved by invoking the function @code{window-splits} and -altered by the function @code{set-window-splits} described next. - -If @code{window-nest} (see below) is non-@code{nil}, the space for the -new window is exclusively taken from the old window, but the splits -status of the involved windows is nevertheless set as described here. -@end defopt +@defopt window-combination-resize +If this variable is @code{nil}, @code{split-window} can only split a +window (denoted by @var{window}) if @var{window}'s screen area is +large enough to accommodate both itself and the new window. This is +the default. -@defun window-splits &optional window -This function returns the splits status of @var{window}. The argument -@var{window} can be any window and defaults to the selected one. +If this variable is non-@code{nil}, @code{split-window} tries to +resize all windows that are part of the same combination as +@var{window}, in order to accommodate the new window. In particular, +this may allow @code{split-window} to succeed even if @var{window} is +a fixed-size window or too small to ordinarily split. -@cindex splits status -The @dfn{splits status} of a window specifies how resizing and deleting -that window may affect the size of other windows in the same window -combination. More precisely, if @var{window}'s splits status is -@code{nil} and @var{window} is resized, the corresponding space is -preferably taken from (or given to) @var{window}'s right sibling. When -@var{window} is deleted, its space is given to its left sibling. If -@var{window}'s splits status is non-@code{nil}, resizing and deleting -@var{window} may resize @emph{all} windows in @var{window}'s -combination. +Also if this variable is non-@code{nil}, subsequent resizing and +deleting @var{window} will usually affect @emph{all} windows in +@var{window}'s combination. -The splits status is initially set by @code{split-window} -from the current value of the variable @code{window-splits} (see above) -and can be reset by the function @code{set-window-splits} (see below). -@end defun - -@defun set-window-splits window &optional status -This function sets the splits status (see above) of @var{window} to -@var{status}. The argument @var{window} can be any window and defaults -to the selected one. The return value is @var{status}. -@end defun +The setting of this variable has no effect if +@code{window-combination-limit} (see below) is non-@code{nil}. +@end defopt -To illustrate the use of @code{window-splits} consider the following -window configuration: +To illustrate the use of @code{window-combination-resize} consider the +following window configuration: @smallexample @group ______________________________________ @@ -1326,8 +886,9 @@ window configuration: @end group @end smallexample -Splitting window @code{W3} with @code{window-splits} @code{nil} -produces a configuration where the size of @code{W2} remains unchanged: +Splitting window @code{W3} with @code{window-combination-resize} +@code{nil} produces a configuration where the size of @code{W2} remains +unchanged: @smallexample @group ______________________________________ @@ -1348,10 +909,8 @@ produces a configuration where the size of @code{W2} remains unchanged: @end group @end smallexample -Splitting @code{W3} with @code{window-splits} non-@code{nil} instead -produces a configuration where all windows have approximately the same -height: - +Splitting @code{W3} with @code{window-combination-resize} non-@code{nil} +instead steals the space for @code{W4} from both @code{W2} and @code{W3}: @smallexample @group ______________________________________ @@ -1372,51 +931,54 @@ height: @end group @end smallexample -@defopt window-nest +@defopt window-combination-limit If this variable is @code{nil}, @code{split-window} creates a new parent window if and only if the old window has no parent window or shall be split orthogonally to the combination it is part of. If this variable -is non-@code{nil}, @code{split-window} always creates a new parent -window. If this variable is always non-@code{nil}, a frame's window -tree is a binary tree so every window but the frame's root window has -exactly one sibling. - -The value of this variable is also assigned to the nest status of the -new parent window. The nest status of any window can be retrieved via -the function @code{window-nest} and altered by the function -@code{set-window-nest}, see below. +is @code{t}, @code{split-window} always creates a new parent window. If +this variable is always @code{t}, a frame's window tree is a binary tree +so every window but the frame's root window has exactly one sibling. +Other values are reserved for future use. + +The value of this variable is also assigned to the combination-limit +status of the new parent window. The combination-limit status of any +window can be retrieved via the function @code{window-combination-limit} +and altered by the function @code{set-window-combination-limit}, see +below. @end defopt -@defun window-nest &optional window -This function returns the nest status of @var{window}. The argument -@var{window} can be any window and defaults to the selected one. Note, -however, that the nest status is currently meaningful for internal -windows only. - -@cindex nest status -The @dfn{nest status} of a window specifies whether that window may be -removed and its subwindows recombined with that window's siblings when -such a sibling's subwindow is deleted. The nest status is initially -assigned by @code{split-window} from the current value of the variable -@code{window-nest} (see above) and can be reset by the function -@code{set-window-nest} (see below). - -If the return value is @code{nil}, subwindows of @var{window} may be +@defun window-combination-limit &optional window +This function returns the combination-limit status of @var{window}. The +argument @var{window} can be any window and defaults to the selected +one. Note, however, that the combination-limit status is currently +meaningful for internal windows only. + +@cindex combination-limit status +The @dfn{combination-limit status} of a window specifies whether that +window may be removed and its child windows recombined with that +window's siblings when such a sibling's child window is deleted. The +combination-limit status is initially assigned by @code{split-window} +from the current value of the variable @code{window-combination-limit} +(see above) and can be reset by the function +@code{set-window-combination-limit} (see below). + +If the return value is @code{nil}, child windows of @var{window} may be recombined with @var{window}'s siblings when a window gets deleted. A -return value of @code{nil} means that subwindows of @var{window} are +return value of @code{nil} means that child windows of @var{window} are never (re-)combined with @var{window}'s siblings in such a case. @end defun -@defun set-window-nest window &optional status -This functions sets the nest status (see above) of @var{window} to -@var{status}. The argument @var{window} can be any window and defaults -to the selected one. Note that setting the nest status is meaningful -for internal windows only. The return value is @var{status}. +@defun set-window-combination-limit window &optional status +This functions sets the combination-limit status (see above) of +@var{window} to @var{status}. The argument @var{window} can be any +window and defaults to the selected one. Note that setting the +combination-limit status is meaningful for internal windows only. The +return value is @var{status}. @end defun -To illustrate the use of @code{window-nest} consider the following -configuration (throughout the following examples we shall assume that -@code{window-splits} invariantly is @code{nil}). +To illustrate the use of @code{window-combination-limit} consider the +following configuration (throughout the following examples we shall +assume that @code{window-combination-resize} invariantly is @code{nil}). @smallexample @group ______________________________________ @@ -1438,7 +1000,8 @@ configuration (throughout the following examples we shall assume that @end smallexample Splitting @code{W2} into two windows above each other with -@code{window-nest} equal @code{nil} will get you a configuration like: +@code{window-combination-limit} equal @code{nil} will get you a +configuration like: @smallexample @group ______________________________________ @@ -1505,9 +1068,9 @@ follows: Hence, with respect to the initial configuration, window @code{W2} has grown at the expense of window @code{W3}. If, however, in the initial -configuration you had split @code{W2} with @code{window-nest} bound to -@code{t}, a new internal window @code{W5} would have been created as -depicted below. +configuration you had split @code{W2} with +@code{window-combination-limit} bound to @code{t}, a new internal window +@code{W5} would have been created as depicted below. @smallexample @group ______________________________________ @@ -1556,7 +1119,7 @@ configuration. For interactive use, Emacs provides two commands which always split the selected window. -@deffn Command split-window-above-each-other &optional size +@deffn Command split-window-below &optional size This function splits the selected window into two windows, one above the other, leaving the upper of the two windows selected, with @var{size} lines. (If @var{size} is negative, then the lower of the two windows @@ -1572,16 +1135,16 @@ is the new, lower window. @defopt split-window-keep-point If this variable is non-@code{nil} (the default), then -@code{split-window-above-each-other} behaves as described above. +@code{split-window-below} behaves as described above. - If it is @code{nil}, then @code{split-window-above-each-other} -adjusts point in each of the two windows to avoid scrolling. (This is -useful on slow terminals.) It selects whichever window contains the -screen line that point was previously on. Other functions are not -affected by this variable. + If it is @code{nil}, then @code{split-window-below} adjusts point +in each of the two windows to avoid scrolling. (This is useful on +slow terminals.) It selects whichever window contains the screen line +that point was previously on. Other functions are not affected by +this variable. @end defopt -@deffn Command split-window-side-by-side &optional size +@deffn Command split-window-right &optional size This function splits the selected window into two windows side-by-side, leaving the selected window on the left with @var{size} columns. If @var{size} is negative, the rightmost window gets @@ -1620,12 +1183,12 @@ window parameters. If the @code{delete-window} parameter specifies a function, that function is called with @var{window} as its sole argument. -If the splits status of @var{window} (@pxref{Splitting Windows}) is +If @code{window-combination-resize} (@pxref{Splitting Windows}) is @code{nil}, the space @var{window} took up is given to its left sibling -if such a window exists and to its right sibling otherwise. If the -splits status of @var{window} is non-@code{nil}, its space is -proportionally distributed among the remaining windows in the same -combination. +if such a window exists and to its right sibling otherwise. If +@code{window-combination-resize} is non-@code{nil}, the space of +@var{window} is proportionally distributed among the remaining windows +in the same combination. @end deffn @deffn Command delete-other-windows &optional window @@ -1644,11 +1207,11 @@ function, it calls that function with @var{window} as its sole argument. @end deffn @deffn Command delete-windows-on &optional buffer-or-name frame -This function deletes all windows showing @var{buffer-or-name} and -returns nil. If there are no windows showing @var{buffer-or-name}, it -does nothing. The optional argument @var{buffer-or-name} may be a -buffer or the name of an existing buffer and defaults to the current -buffer. Invoking this command on a minibuffer signals an error. +This function deletes all windows showing @var{buffer-or-name}. If +there are no windows showing @var{buffer-or-name}, it does nothing. +The optional argument @var{buffer-or-name} may be a buffer or the name +of an existing buffer and defaults to the current buffer. Invoking +this command on a minibuffer signals an error. The function @code{delete-windows-on} operates by calling @code{delete-window} for each window showing @var{buffer-or-name}. If a @@ -1876,7 +1439,7 @@ This function does not select a window that has a non-@code{nil} @end deffn The following function returns a copy of the list of windows in the -cyclic odering. +cyclic ordering. @defun window-list-1 &optional window &optional minibuf &optional all_frames This function returns a list of live windows. The optional arguments @@ -1886,7 +1449,7 @@ in the list. See the description of @code{next-window} for details. The optional argument @var{window} specifies the first window to list and defaults to the selected window. If @var{window} is not on the list of windows returned, some other window will be listed first but no error -is signalled. +is signaled. @end defun The functions described below use @code{window-list-1} for generating a @@ -1999,7 +1562,7 @@ This function makes @var{window} display @var{buffer-or-name} and returns @code{nil}. The argument @var{window} has to denote a live window and defaults to the selected one. The argument @var{buffer-or-name} must specify a buffer or the name of an existing -buffer. An error is signalled when @var{window} is @dfn{strongly} +buffer. An error is signaled when @var{window} is @dfn{strongly} dedicated to its buffer (@pxref{Dedicated Windows}) and does not already display @var{buffer-or-name}. @@ -2086,7 +1649,7 @@ If a window displaying @var{buffer-or-name} is dedicated (@pxref{Dedicated Windows}) and is not the only window on its frame, that window is deleted. If that window is the only window on its frame and there are other frames on the frame's terminal, that frame is dealt -with by the function spcecified by @code{frame-auto-hide-function} +with by the function specified by @code{frame-auto-hide-function} (@pxref{Quitting Windows}). Otherwise, the buffer provided by the function @code{switch-to-prev-buffer} (@pxref{Window History}) is displayed in the window instead. @@ -2206,7 +1769,7 @@ unless @var{norecord} is non-@code{nil}. The command @code{display-buffer} flexibly chooses a window for display, and displays a specified buffer in that window. It can be -called interactively, via the key binding @kbd{C-x 4 o}. It is also +called interactively, via the key binding @kbd{C-x 4 C-o}. It is also used as a subroutine by many functions and commands, including @code{switch-to-buffer} and @code{pop-to-buffer} (@pxref{Switching Buffers}). @@ -2264,7 +1827,7 @@ The constant @code{display-buffer-fallback-action}. @noindent Each action function is called in turn, passing the buffer as the first argument and the combined action alist as the second argument, -until one of the functions returns non-nil. +until one of the functions returns non-@code{nil}. The argument @var{action} can also have a non-@code{nil}, non-list value. This has the special meaning that the buffer should be @@ -2315,7 +1878,7 @@ returns the window if it succeeds, and @code{nil} if it fails. This function tries to display @var{buffer} in the selected window. It fails if the selected window is a minibuffer window or is dedicated to another buffer (@pxref{Dedicated Windows}). It also fails if -@var{alist} has a non-nil @code{inhibit-same-window} entry. +@var{alist} has a non-@code{nil} @code{inhibit-same-window} entry. @end defun @defun display-buffer-reuse-window buffer alist @@ -3324,7 +2887,7 @@ This function scrolls the text in the selected window so that point is displayed at a specified vertical position within the window. It does not ``move point'' with respect to the text. -If @var{count} is a nonnegative number, that puts the line containing +If @var{count} is a non-negative number, that puts the line containing point @var{count} lines down from the top of the window. If @var{count} is a negative number, then it counts upward from the bottom of the window, so that @minus{}1 stands for the last usable @@ -3679,7 +3242,7 @@ as @code{save-window-excursion}: @group (let ((config (current-window-configuration))) (unwind-protect - (progn (split-window-vertically nil) + (progn (split-window-below nil) @dots{}) (set-window-configuration config))) @end group @@ -3783,7 +3346,7 @@ selected one. The optional argument @var{ignore} non-@code{nil} means to ignore minimum window sizes and fixed size restrictions. If @var{ignore} -equals @code{safe}, this means subwindows can get as small as one line +equals @code{safe}, this means windows can get as small as one line and/or two columns. @end defun diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index b9175ce51ea..758cdde1dea 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * etags.1: Fix typo. + 2011-10-06 Chong Yidong <cyd@stupidchicken.com> * emacsclient.1: Document how -a "" starts the daemon. @@ -18,7 +22,7 @@ * Version 23.3 released. -2011-01-02 Jari Aalto <jari.aalto@cante.net> (tiny change) +2011-01-02 Jari Aalto <jari.aalto@cante.net> * emacsclient.1: Arrange options alphabetically (Bug#7620). diff --git a/doc/man/etags.1 b/doc/man/etags.1 index f6b46add215..f7ffa112f3c 100644 --- a/doc/man/etags.1 +++ b/doc/man/etags.1 @@ -49,7 +49,7 @@ format understood by \&. Both forms of the program understand the syntax of C, Objective C, C++, Java, Fortran, Ada, Cobol, Erlang, Forth, HTML, LaTeX, Emacs Lisp/Common Lisp, Lua, Makefile, Pascal, Perl, -PHP, Postscript, Python, Prolog, Scheme and +PHP, PostScript, Python, Prolog, Scheme and most assembler\-like syntaxes. Both forms read the files specified on the command line, and write a tag table (defaults: \fBTAGS\fP for \fBetags\fP, \fBtags\fP for diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 029406e2d30..924f3501bfa 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,22 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * org.texi (Agenda commands, Exporting Agenda Views): Fix typos. + +2011-11-15 Juanma Barranquero <lekktu@gmail.com> + + * ede.texi (project-am-texinfo): + * gnus.texi (Sending or Not Sending): + * org.texi (Template elements): Fix typos. + +2011-11-14 Juanma Barranquero <lekktu@gmail.com> + + * ediff.texi (Hooks): + * sem-user.texi (Semanticdb Roots): Fix typos. + +2011-11-11 Juanma Barranquero <lekktu@gmail.com> + + * semantic.texi (Tag handling): Fix typo. + 2011-10-31 Katsumi Yamaoka <yamaoka@jpl.org> * gnus.texi (Other Gnus Versions): Remove. @@ -58,7 +77,7 @@ Release MH-E manual version 8.3. - * mh-e.texi: (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for + * mh-e.texi (VERSION, EDITION, UPDATED, UPDATE-MONTH): Update for release 8.3. (Preface): Updated support information. (From Bill Wohler): Reset text to original version. As a @@ -296,7 +315,7 @@ 2011-08-15 Eric Schulte <schulte.eric@gmail.com> - * org.texi (Evaluating code blocks): Expanded discussion of + * org.texi (Evaluating code blocks): Expanded discussion of #+call: line syntax. (Header arguments in function calls): Expanded discussion of #+call: line syntax. @@ -2290,7 +2309,7 @@ 2009-08-25 Michael Albinus <michael.albinus@gmx.de> * dbus.texi (Bus names): Add optional parameter TIMEOUT to dbus-ping. - Describe autostart behaviour of dbus-ping. + Describe autostart behavior of dbus-ping. (Synchronous Methods, Asynchronous Methods): Use English numeric format for timeout values. (Top): Remove footnote saying D-Bus is not enabled by diff --git a/doc/misc/ada-mode.texi b/doc/misc/ada-mode.texi index 66cdb200111..0eb20d01324 100644 --- a/doc/misc/ada-mode.texi +++ b/doc/misc/ada-mode.texi @@ -184,7 +184,7 @@ convention, where file names are a simple modification of the Ada names, and the extension for specs and bodies are @samp{.ads} and @samp{.adb}, respectively. -Ada mode uses the file extentions to allow moving from a package body +Ada mode uses the file extensions to allow moving from a package body to the corresponding spec and back. Ada mode supports a list of alternative file extensions for specs and bodies. @@ -209,7 +209,7 @@ whose extension is @file{.ads}, it will take the first available file that ends with either @file{.adb}, @file{_b.ada} or @file{.body}. -Simililarly, if Ada mode is looking for a spec, it will look for +Similarly, if Ada mode is looking for a spec, it will look for @file{.ads} or @file{_s.ada}. If the filename is not derived from the Ada name following the GNAT @@ -1357,7 +1357,7 @@ specifies the casing of one word or word fragment. Comments may be included, separated from the word by a space. If the word starts with an asterisk (@key{*}), it defines the casing -af a word fragemnt (or ``substring''); part of a word between two +as a word fragment (or ``substring''); part of a word between two underscores or word boundary. For example: diff --git a/doc/misc/auth.texi b/doc/misc/auth.texi index a16da92343e..b64562f6875 100644 --- a/doc/misc/auth.texi +++ b/doc/misc/auth.texi @@ -64,13 +64,13 @@ It is a way for multiple applications to share a single configuration @menu * Overview:: Overview of the auth-source library. -* Help for users:: -* Secret Service API:: -* Help for developers:: -* GnuPG and EasyPG Assistant Configuration:: -* Index:: -* Function Index:: -* Variable Index:: +* Help for users:: +* Secret Service API:: +* Help for developers:: +* GnuPG and EasyPG Assistant Configuration:: +* Index:: +* Function Index:: +* Variable Index:: @end menu @end ifnottex @@ -182,7 +182,7 @@ Here's a mixed example using two sources: If you don't customize @code{auth-sources}, you'll have to live with the defaults: any host and any port are looked up in the netrc file @code{~/.authinfo.gpg}, which is a GnuPG encrypted file -(@pxref{GnuPG and EasyPG Assistant Configuration}). +(@pxref{GnuPG and EasyPG Assistant Configuration}). If that fails, the unencrypted netrc files @code{~/.authinfo} and @code{~/.netrc} will be used. @@ -340,7 +340,7 @@ If you are using earlier versions of Emacs, you will need: @end lisp If you want your GnuPG passwords to be cached, set up @code{gpg-agent} -or EasyPG Assitant +or EasyPG Assistant (@pxref{Caching Passphrases, , Caching Passphrases, epa}). To quick start, here are some questions: diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index 887e3f3c808..55c2c4c0ae8 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi @@ -287,11 +287,11 @@ Configuration Basics Styles -* Built-in Styles:: -* Choosing a Style:: -* Adding Styles:: -* Guessing the Style:: -* File Styles:: +* Built-in Styles:: +* Choosing a Style:: +* Adding Styles:: +* Guessing the Style:: +* File Styles:: Customizing Auto-newlines @@ -311,19 +311,19 @@ Indentation Engine Basics Syntactic Symbols -* Function Symbols:: -* Class Symbols:: -* Conditional Construct Symbols:: -* Switch Statement Symbols:: -* Brace List Symbols:: -* External Scope Symbols:: -* Paren List Symbols:: -* Literal Symbols:: -* Multiline Macro Symbols:: -* Objective-C Method Symbols:: +* Function Symbols:: +* Class Symbols:: +* Conditional Construct Symbols:: +* Switch Statement Symbols:: +* Brace List Symbols:: +* External Scope Symbols:: +* Paren List Symbols:: +* Literal Symbols:: +* Multiline Macro Symbols:: +* Objective-C Method Symbols:: * Java Symbols:: -* Statement Block Symbols:: -* K&R Symbols:: +* Statement Block Symbols:: +* K&R Symbols:: Customizing Indentation @@ -343,8 +343,8 @@ Line-Up Functions Customizing Macros -* Macro Backslashes:: -* Macros with ;:: +* Macro Backslashes:: +* Macros with ;:: @end detailmenu @end menu @@ -912,7 +912,7 @@ construct, should the point start inside it. If @ccmode fails to find function beginnings or ends inside the current declaration scope, it will search the enclosing scopes. If you want @ccmode to recognize functions only at the top level@footnote{this was @ccmode{}'s -behaviour prior to version 5.32.}, set @code{c-defun-tatic} to +behavior prior to version 5.32.}, set @code{c-defun-tatic} to @code{t}. These functions are analogous to the Emacs built-in commands @@ -1173,7 +1173,7 @@ Full details on how these minor modes work are at @ref{Electric Keys}, and @ref{Indentation Engine Basics}. You can toggle each of these minor modes on and off, and you can -configure @ccmode{} so that it starts up with your favourite +configure @ccmode{} so that it starts up with your favorite combination of them (@pxref{Sample .emacs File}). By default, when you initialize a buffer, electric mode and syntactic-indentation mode are enabled but the other two modes are disabled. @@ -2537,11 +2537,11 @@ As an alternative to writing a style definition yourself, you can have already formatted piece of your code, @ref{Guessing the Style}. @menu -* Built-in Styles:: -* Choosing a Style:: -* Adding Styles:: -* Guessing the Style:: -* File Styles:: +* Built-in Styles:: +* Choosing a Style:: +* Adding Styles:: +* Guessing the Style:: +* File Styles:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -4266,19 +4266,19 @@ Java. @ref{Java Symbols}. @end table @menu -* Function Symbols:: -* Class Symbols:: -* Conditional Construct Symbols:: -* Switch Statement Symbols:: -* Brace List Symbols:: -* External Scope Symbols:: -* Paren List Symbols:: -* Literal Symbols:: -* Multiline Macro Symbols:: -* Objective-C Method Symbols:: +* Function Symbols:: +* Class Symbols:: +* Conditional Construct Symbols:: +* Switch Statement Symbols:: +* Brace List Symbols:: +* External Scope Symbols:: +* Paren List Symbols:: +* Literal Symbols:: +* Multiline Macro Symbols:: +* Objective-C Method Symbols:: * Java Symbols:: -* Statement Block Symbols:: -* K&R Symbols:: +* Statement Block Symbols:: +* K&R Symbols:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -6653,8 +6653,8 @@ these macros properly, see @ref{Macros with ;}. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @menu -* Macro Backslashes:: -* Macros with ;:: +* Macro Backslashes:: +* Macros with ;:: @end menu @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/doc/misc/dbus.texi b/doc/misc/dbus.texi index e6fb00d3482..79c7ada3b0b 100644 --- a/doc/misc/dbus.texi +++ b/doc/misc/dbus.texi @@ -553,7 +553,7 @@ data from a running system: @node Methods and Signal @section Applying the functionality. -Methods and signals are the communicatione means to D-Bus. The +Methods and signals are the communication means to D-Bus. The following functions return their specifications. @defun dbus-introspect-get-method-names bus service path interface diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi index 13b640a09fe..55dc7f9a822 100644 --- a/doc/misc/ede.texi +++ b/doc/misc/ede.texi @@ -518,7 +518,7 @@ It would look like this: (defun MY-LOAD (dir) "Load a project of type `cpp-root' for the directory DIR. Return nil if there isn't one." - ;; Use your preferred constructin method here. + ;; Use your preferred construction method here. (ede-cpp-root-project "NAME" :file (expand-file-name "FILE" dir) :locate-fcn 'MYFCN) ) @@ -3273,7 +3273,7 @@ Return the default macro to 'edit' for this object type. @end deffn @deffn Method project-compile-target-command :AFTER this -Default target t- use when compling a texinfo file. +Default target t- use when compiling a texinfo file. @end deffn @deffn Method ede-documentation :AFTER this @@ -3370,7 +3370,7 @@ Type: @code{(or null string)} @* Default Value: @code{nil} Emacs regex matching auxiliary source code this target accepts. -Aux source are source code files needed for compilation, which are not comiled +Aux source are source code files needed for compilation, which are not compiled themselves. @refill diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 20c2ed90873..62cd684b57b 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi @@ -1207,7 +1207,7 @@ This hook can be used to alter bindings in Ediff's keymap, @code{ediff-mode-map}. These hooks are run right after the default bindings are set but before @code{ediff-load-hook}. The regular user needs not be concerned with this -hook---it is provided for implementors of other Emacs packages built on top +hook---it is provided for implementers of other Emacs packages built on top of Ediff. @item ediff-before-setup-windows-hook diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index a9d80d868b6..c44cc1c9b09 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -1048,7 +1048,7 @@ occurs. You can customize the value of the @code{mml-enable-flowed} variable to enable or disable the flowed encoding usage when newline -characteres are present in the buffer. +characters are present in the buffer. On decoding flowed text, lines with soft newline characters are filled together and wrapped after the column decided by diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index d1cecf1347a..00755262075 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -389,7 +389,7 @@ This checks that dividing one by zero signals an error of type @code{arith-error}. The @code{:type} argument to @code{should-error} is optional; if absent, any type of error is accepted. @code{should-error} returns an error description of the error that was -signalled, to allow additional checks to be made. The error +signaled, to allow additional checks to be made. The error description has the format @code{(ERROR-SYMBOL . DATA)}. There is no @code{should-not-error} macro since tests that signal an @@ -748,7 +748,7 @@ explanation function. Both @code{ert-run-tests-interactively} and @code{ert-run-tests-batch} are implemented on top of the lower-level test handling code in the -sections of @file{ert.el} labelled ``Facilities for running a single test'', +sections of @file{ert.el} labeled ``Facilities for running a single test'', ``Test selectors'', and ``Facilities for running a whole set of tests''. If you want to write code that works with ERT tests, you should take a diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 74082bfd3b1..d2705155887 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -379,7 +379,7 @@ eshell/sudo is a compiled Lisp function in `em-unix.el' sudo is an alias, defined as "*sudo $*" @end example -Some of the built-in commands have a special behaviour in Eshell: +Some of the built-in commands have a special behavior in Eshell: @table @code diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi index 7528abca58d..262c3d734fe 100644 --- a/doc/misc/faq.texi +++ b/doc/misc/faq.texi @@ -80,7 +80,7 @@ Emacs, the Emacs manual is often the best starting point. @ifnottex @insertcopying -@end ifnottex +@end ifnottex @menu * FAQ notation:: @@ -368,7 +368,7 @@ only be known if and when a judge rules on its validity and scope. There has never been a copyright infringement case involving the GPL to set any precedents. Although legal actions have been brought against companies for violating the terms of the GPL, so far all have been -settled out of court (in favour of the plaintiffs). Please take any +settled out of court (in favor of the plaintiffs). Please take any discussion regarding this issue to the newsgroup @uref{news:gnu.misc.discuss}, which was created to hold the extensive flame wars on the subject. diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index e8e89ed2a30..b5bb75f7284 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -12,7 +12,7 @@ @section Frequently Asked Questions @menu -* FAQ - Changes:: +* FAQ - Changes:: * FAQ - Introduction:: About Gnus and this FAQ. * FAQ 1 - Installation FAQ:: Installation of Gnus. * FAQ 2 - Startup / Group buffer:: Start up questions and the @@ -37,7 +37,7 @@ This is the new Gnus Frequently Asked Questions list. -Please submit features and suggestions to the +Please submit features and suggestions to the @email{ding@@gnus.org, ding list}. @node FAQ - Changes @@ -166,7 +166,7 @@ package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs 21 is outdated). You can get the latest released version of Gnus from @uref{http://www.gnus.org/dist/gnus.tar.gz} -or via anonymous FTP from +or via anonymous FTP from @uref{ftp://ftp.gnus.org/pub/gnus/gnus.tar.gz}. @node FAQ 1-4 @@ -176,7 +176,7 @@ What to do with the tarball now? @subsubheading Answer -Untar it via @samp{tar xvzf gnus.tar.gz} and do the common +Untar it via @samp{tar xvzf gnus.tar.gz} and do the common @samp{./configure; make; make install} circle. (under MS-Windows either get the Cygwin environment from @uref{http://www.cygwin.com} @@ -344,7 +344,7 @@ hit @samp{C-y}. @subsection Getting Messages @menu -* FAQ 3-1:: I just installed Gnus, started it via @samp{M-x gnus} +* FAQ 3-1:: I just installed Gnus, started it via @samp{M-x gnus} but it only says "nntp (news) open error", what to do? * FAQ 3-2:: I'm working under Windows and have no idea what ~/.gnus.el means. @@ -369,8 +369,8 @@ hit @samp{C-y}. @node FAQ 3-1 @subsubheading Question 3.1 -I just installed Gnus, started it via -@samp{M-x gnus} +I just installed Gnus, started it via +@samp{M-x gnus} but it only says "nntp (news) open error", what to do? @subsubheading Answer @@ -396,14 +396,14 @@ I'm working under Windows and have no idea what ~/.gnus.el means. The ~/ means the home directory where Gnus and Emacs look for the configuration files. However, you don't really need to know what this means, it suffices that Emacs knows -what it means :-) You can type -@samp{C-x C-f ~/.gnus.el RET } +what it means :-) You can type +@samp{C-x C-f ~/.gnus.el RET } (yes, with the forward slash, even on Windows), and Emacs will open the right file for you. (It will most likely be new, and thus empty.) However, I'd discourage you from doing so, since the directory Emacs chooses will most certainly not be what -you want, so let's do it the correct way. +you want, so let's do it the correct way. The first thing you've got to do is to create a suitable directory (no blanks in directory name please) e.g. c:\myhome. Then you must set the environment @@ -442,7 +442,7 @@ machine news.yourprovider.net login YourUserName password YourPassword . Make sure that the file isn't readable to others if you work on a OS which is capable of doing so. (Under Unix -say +say @example chmod 600 ~/.authinfo @end example @@ -477,13 +477,13 @@ post on this server as well as I am, what's that? Some providers allow restricted anonymous access and full access only after authorization. To make Gnus send authinfo -to those servers append +to those servers append @example force yes @end example @noindent - + to the line for those servers in ~/.authinfo. @node FAQ 3-6 @@ -774,7 +774,7 @@ When I enter a group, all read messages are gone. How to view them again? @subsubheading Answer -If you enter the group by saying +If you enter the group by saying @samp{RET} in group buffer with point over the group, only unread and ticked messages are loaded. Say @samp{C-u RET} @@ -787,13 +787,13 @@ Loading only unread messages can be annoying if you have threaded view enabled, (setq gnus-fetch-old-headers 'some) @end example @noindent - + in ~/.gnus.el to load enough old articles to prevent teared threads, replace 'some with t to load -all articles (Warning: Both settings enlarge the amount of data which is +all articles (Warning: Both settings enlarge the amount of data which is fetched when you enter a group and slow down the process of entering a group). -If you already use Gnus 5.10, you can say -@samp{/o N} +If you already use Gnus 5.10, you can say +@samp{/o N} In summary buffer to load the last N messages, this feature is not available in 5.8.8 If you don't want all old messages, but the parent of the message you're just reading, @@ -822,9 +822,9 @@ How to view the headers of a message? @subsubheading Answer -Say @samp{t} +Say @samp{t} to show all headers, one more -@samp{t} +@samp{t} hides them again. @node FAQ 4-4 @@ -834,10 +834,10 @@ How to view the raw unformatted message? @subsubheading Answer -Say -@samp{C-u g} +Say +@samp{C-u g} to show the raw message -@samp{g} +@samp{g} returns to normal view. @node FAQ 4-5 @@ -873,7 +873,7 @@ Say @example (eval-after-load "mm-decode" - '(progn + '(progn (add-to-list 'mm-discouraged-alternatives "text/html") (add-to-list 'mm-discouraged-alternatives "text/richtext"))) @end example @@ -1042,7 +1042,7 @@ back ends. Gnus thinks "highest-article-number - lowest-article-number = total-number-of-articles". This works OK for Usenet groups, but if you delete and move many messages in mail groups, this fails. To cure the -symptom, enter the group via @samp{C-u RET} +symptom, enter the group via @samp{C-u RET} (this makes Gnus get all messages), then hit @samp{M P b} to mark all messages and then say @samp{B m name.of.group} to move @@ -1162,7 +1162,7 @@ general rule (regular expression .*) which denotes where articles should go which don't match any other rule. If the folder doesn't exist yet, it will be created as soon as an article lands there. By default the mail will be -send to all groups whose rules match. If you +send to all groups whose rules match. If you don't want that (you probably don't want), say @example @@ -1203,7 +1203,7 @@ from using them): ("Spam" "^CC: .*azzrael@@t-online.invalid") ("Spam" "^X-Mailer-Version: 1.50 BETA") ("Uni" "^\\(CC:\\|To:\\).*localpart@@uni-koblenz.invalid.*") - ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|adress@@two.invalid\\)") + ("Inbox" "^\\(CC:\\|To:\\).*\\(my\ name\\|address@@one.invalid\\|address@@two.invalid\\)") ("Spam" ""))) @end example @noindent @@ -1393,13 +1393,13 @@ You can use ispell.el to spell-check stuff in Emacs. So the first thing to do is to make sure that you've got either @uref{http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell.html, ispell} or @uref{http://aspell.sourceforge.net/, aspell} -installed and in your Path. Then you need +installed and in your Path. Then you need @uref{http://www.kdstevens.com/~stevens/ispell-page.html, ispell.el} -and for on-the-fly spell-checking +and for on-the-fly spell-checking @uref{http://www-sop.inria.fr/members/Manuel.Serrano/flyspell/flyspell.html, flyspell.el}. -Ispell.el is shipped with Emacs and available through the XEmacs package system, -flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is -available through the package system, so there should be no need to install them +Ispell.el is shipped with Emacs and available through the XEmacs package system, +flyspell.el is shipped with Emacs and part of XEmacs text-modes package which is +available through the package system, so there should be no need to install them manually. Ispell.el assumes you use ispell, if you choose aspell say @@ -1408,7 +1408,7 @@ Ispell.el assumes you use ispell, if you choose aspell say (setq ispell-program-name "aspell") @end example @noindent - + in your Emacs configuration file. If you want your outgoing messages to be spell-checked, say @@ -1445,7 +1445,7 @@ Yes, say something like (ispell-change-dictionary "english"))))) @end example @noindent - + in ~/.gnus.el. Change "^de\\." and "deutsch8" to something that suits your needs. @@ -1472,7 +1472,7 @@ cause Gnus to insert the full address for you. See the node "Mail Aliases" in Message (not Gnus) manual for details. -However, what you really want is the Insidious Big Brother +However, what you really want is the Insidious Big Brother Database bbdb. Get it through the XEmacs package system or from @uref{http://bbdb.sourceforge.net/, bbdb's homepage}. Now place the following in ~/.gnus.el, to activate bbdb for Gnus: @@ -1488,7 +1488,7 @@ place them in ~/.emacs: @example (require 'bbdb) -;;If you don't live in Northern America, you should disable the +;;If you don't live in Northern America, you should disable the ;;syntax check for telephone numbers by saying (setq bbdb-north-american-phone-numbers-p nil) ;;Tell bbdb about your email address: @@ -1529,7 +1529,7 @@ X-Face. So fire up some image manipulation program (say Gimp), open the image you want to include, cut out the relevant part, reduce color depth to 1 bit, resize to 48*48 and save as bitmap. Now you should get the compface -package from +package from @uref{ftp://ftp.cs.indiana.edu:/pub/faces/, this site}. and create the actual X-face by saying @@ -1539,7 +1539,7 @@ cat file.face | sed 's/\\/\\\\/g;s/\"/\\\"/g;' > file.face.quoted @end example @noindent -If you can't use compface, there's an online X-face converter at +If you can't use compface, there's an online X-face converter at @uref{http://www.dairiki.org/xface/}. If you use MS Windows, you could also use the WinFace program from @uref{http://www.xs4all.nl/~walterln/winface/}. @@ -1668,7 +1668,7 @@ by saying: @noindent in ~/.gnus.el. If you use Gnus 5.9 or earlier, you can use this -instead (works for newer versions as well): +instead (works for newer versions as well): @example (eval-after-load "message" @@ -1961,12 +1961,12 @@ receives the mail you write from Gnus and sends them when you're online. Let's talk about Unix systems first: For the news part, -the easiest solution is a small nntp server like +the easiest solution is a small nntp server like @uref{http://www.leafnode.org/, Leafnode} or @uref{http://infa.abo.fi/~patrik/sn/, sn}, of course you can also install a full featured news -server like -@uref{http://www.isc.org/products/INN/, inn}. +server like +@uref{http://www.isc.org/products/INN/, inn}. Then you want to fetch your Mail, popular choices are @uref{http://www.catb.org/~esr/fetchmail/, fetchmail} and @uref{http://pyropus.ca/software/getmail/, getmail}. @@ -1978,8 +1978,8 @@ sending part: This can be done with every MTA like @uref{http://www.exim.org/, exim} or @uref{http://www.qmail.org/, qmail}. -On windows boxes I'd vote for -@uref{http://www.tglsoft.de/, Hamster}, +On windows boxes I'd vote for +@uref{http://www.tglsoft.de/, Hamster}, it's a small freeware, open-source program which fetches your mail and news from remote servers and offers them to Gnus (or any other mail and/or news reader) via nntp @@ -2136,7 +2136,7 @@ Which mailing lists and newsgroups are there? @subsubheading Answer There's the newsgroup gnu.emacs.gnus (also available as -@uref{http://dir.gmane.org/gmane.emacs.gnus.user, +@uref{http://dir.gmane.org/gmane.emacs.gnus.user, gmane.emacs.gnus.user}) which deals with general Gnus questions. If you have questions about development versions of Gnus, you should better ask on the ding mailing list, see below. @@ -2149,7 +2149,7 @@ de.comm.software.gnus. The ding mailing list (ding@@gnus.org) deals with development of Gnus. You can read the ding list via NNTP, too under the name -@uref{http://dir.gmane.org/gmane.emacs.gnus.general, +@uref{http://dir.gmane.org/gmane.emacs.gnus.general, gmane.emacs.gnus.general} from news.gmane.org. @node FAQ 8-5 @@ -2160,7 +2160,7 @@ Where to report bugs? @subsubheading Answer Say @samp{M-x gnus-bug}, this will start -a message to the +a message to the @email{bugs@@gnus.org, gnus bug mailing list} including information about your environment which make it easier to help you. @@ -2237,7 +2237,7 @@ building of summary say at the bottom of your ~/.gnus.el, this will make gnus byte-compile things like -gnus-summary-line-format. +gnus-summary-line-format. then you could increase the value of gc-cons-threshold by saying something like @@ -2254,7 +2254,7 @@ recent GNU Emacs, you should say (setq gnus-use-correct-string-widths nil) @end example @noindent - + in ~/.gnus.el (thanks to Jesper harder for the last two suggestions). Finally if you are still using 5.8.8 or 5.9 and experience speed problems with summary diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 70ed62ddfa9..a3a93c6ef61 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -1001,7 +1001,7 @@ press @kbd{^} from the Group buffer to see it. In the Server buffer, you can press @kbd{RET} on a defined server to see all the groups it serves (subscribed or not!). You can also add or delete servers, edit a foreign server's definition, agentize or de-agentize a server, and -do many other neat things. @xref{Server Buffer}. +do many other neat things. @xref{Server Buffer}. @xref{Foreign Groups}. @xref{Agent Basics}. @vindex gnus-select-method @@ -7665,7 +7665,7 @@ has its own article buffer. This implies that it's not possible to have more than one article buffer in a group at a time. But sometimes you might want to display all the latest emails from your mother, your father, your aunt, your uncle and -your 17 cousins to coordinate the next christmas party. +your 17 cousins to coordinate the next Christmas party. That's where sticky articles come in handy. A sticky article buffer basically is a normal article buffer, but it won't be reused when you @@ -11805,7 +11805,7 @@ fit these criteria. To use this, make sure that you have @code{w3m} and @code{curl} installed. If you have, then Gnus should display @acronym{HTML} -automatically. +automatically. @@ -18001,7 +18001,7 @@ see the event's date. @code{gnus-diary} provides two supplemental user formats to be used in summary line formats. @code{D} corresponds to a formatted time string for the next occurrence of the event (e.g. ``Sat, Sep 22 01, 12:00''), -while @code{d} corresponds to an approximative remaining time until the +while @code{d} corresponds to an approximate remaining time until the next occurrence of the event (e.g. ``in 6 months, 1 week''). For example, here's how Joe's birthday is displayed in my @@ -18105,7 +18105,7 @@ mail sending with @code{nndiary}: @itemize @bullet @item @code{nndiary} is a @emph{real} mail back end. You really send real diary -messsages for real. This means for instance that you can give +messages for real. This means for instance that you can give appointments to anybody (provided they use Gnus and @code{nndiary}) by sending the diary message to them as well. @item @@ -21078,8 +21078,8 @@ as well. This chapter describes tools for searching groups and servers for articles matching a query and then retrieving those articles. Gnus -provides a simpler mechanism for searching through articles in a summary buffer -to find those matching a pattern. @xref{Searching for Articles}. +provides a simpler mechanism for searching through articles in a summary buffer +to find those matching a pattern. @xref{Searching for Articles}. @menu * nnir:: Searching with various engines. @@ -21110,7 +21110,7 @@ interface. The @code{nnimap} and @code{gmane} search engines should work with no configuration. Other engines require a local index that needs to be -created and maintained outside of Gnus. +created and maintained outside of Gnus. @node Basic Usage @@ -21150,7 +21150,7 @@ One more thing: individual search engines may have special search features. You can access these special features by giving a prefix-arg to @code{gnus-group-make-nnir-group}. If you are searching multiple groups with different search engines you will be prompted for the -special search features for each engine separately. +special search features for each engine separately. @node Setting up nnir @@ -21191,7 +21191,7 @@ named @code{home} you can use @lisp (setq gnus-secondary-select-methods - '((nnml "home" + '((nnml "home" (nnimap-address "localhost") (nnir-search-engine namazu)))) @end lisp @@ -21216,9 +21216,9 @@ could change this to @node The imap Engine @subsubsection The imap Engine -The @code{imap} engine requires no configuration. +The @code{imap} engine requires no configuration. -Queries using the @code{imap} engine follow a simple query language. +Queries using the @code{imap} engine follow a simple query language. The search is always case-insensitive and supports the following features (inspired by the Google search input language): @@ -21231,7 +21231,7 @@ operators must be written with all capital letters to be recognised. Also preceding a term with a - sign is equivalent to NOT term. -@item Automatic AND queries +@item Automatic AND queries If you specify multiple words then they will be treated as an AND expression intended to match all components. @@ -21264,7 +21264,7 @@ customize @code{nnir-imap-default-search-key}. For example to use @node The gmane Engine @subsubsection The gmane Engine -The @code{gmane} engine requires no configuration. +The @code{gmane} engine requires no configuration. Gmane queries follow a simple query language: @@ -21278,11 +21278,11 @@ recognised. @item Required and excluded terms + and - can be used to require or exclude terms, e.g. football -american -@item Unicode handling +@item Unicode handling The search engine converts all text to utf-8, so searching should work in any language. -@item Stopwords +@item Stopwords Common English words (like 'the' and 'a') are ignored by default. You can override this by prefixing such words with a + (e.g. +the) or enclosing the word in quotes (e.g. "the"). @@ -21345,7 +21345,7 @@ to get a group name. By default this is @code{$HOME/Mail}. Using the namazu engine requires creating and maintaining index files. One directory should contain all the index files, and nnir must be told where to find them by setting the @code{nnir-namazu-index-directory} -variable. +variable. To work correctly the @code{nnir-namazu-remove-prefix} variable must also be correct. This is the prefix to remove from each file name @@ -21408,7 +21408,7 @@ this command periodically, say every four hours. This engine is obsolete. @node Customizations -@subsubsection Custimozations +@subsubsection Customizations @table @code @@ -26756,7 +26756,7 @@ Sudish Joseph---innumerable bug fixes. Ilja Weis---@file{gnus-topic.el}. @item -Steven L. Baur---lots and lots and lots of bugs detections and fixes. +Steven L. Baur---lots and lots and lots of bug detection and fixes. @item Vladimir Alexiev---the refcard and reference booklets. diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index c7d82245973..18e11aeeeb3 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi @@ -52,7 +52,7 @@ developing GNU and promoting software freedom.'' @node Top @top Newsticker -@insertcopying +@insertcopying @end ifnottex @@ -112,9 +112,9 @@ enclosed files (as delivered by podcasts, e.g.). Here are screen shots of the @uref{newsticker-1.7.png, version 1.7 (current version)} and some older screen shots: @uref{newsticker-1.6.png, version 1.6}, -@uref{newsticker-1.5.png, version 1.5}, +@uref{newsticker-1.5.png, version 1.5}, @uref{newsticker-1.4.png, version 1.4} -@uref{newsticker-1.3.png, version 1.3}, +@uref{newsticker-1.3.png, version 1.3}, @uref{newsticker-1.0.png, version 1.0}. @end ifhtml @@ -163,7 +163,7 @@ You can choose between two different frontends for reading headlines: @item Newsticker's @emph{treeview} uses separate windows for the feeds (in tree form), a list of headlines for the current feed, and the content of the current headline. Feeds can be placed into groups -which itself can be placed in groups and so on. +which itself can be placed in groups and so on. @item Newsticker's @emph{plainview} displays all headlines in a single buffer, called @samp{*newsticker*}. The modeline in the @samp{*newsticker*} buffer informs whenever new headlines have @@ -171,7 +171,7 @@ arrived. @end itemize In both views clicking mouse-button 2 or pressing RET on a headline will call @code{browse-url} to load the corresponding news story in -your favourite web browser. +your favorite web browser. @findex newsticker-start-ticker @findex newsticker-stop-ticker @@ -205,7 +205,7 @@ and some of the most important options. @item @code{newsticker-retrieval} contains options that define which news -feeds are retrieved and how this is done. +feeds are retrieved and how this is done. @itemize @item @@ -241,7 +241,7 @@ automatically mark headlines as immortal or old. @item @code{newsticker-hooks} contains options for hooking other Emacs -commands to newsticker functions. +commands to newsticker functions. @itemize @item @vindex newsticker-new-item-functions @@ -313,5 +313,3 @@ Byte-compiling newsticker.el is recommended. @printindex cp @bye - - diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 2a3d99ca7f4..34a4ba4f8f3 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@ -36,7 +36,7 @@ @c orgkey{key} A key item @c orgcmd{key,cmd} Key with command name -@c xorgcmd{key,cmmand} Key with command name as @itemx +@c xorgcmd{key,command} Key with command name as @itemx @c orgcmdnki{key,cmd} Like orgcmd, but do not index the key @c orgcmdtkc{text,key,cmd} Like orgcmd,special text instead of key @c orgcmdkkc{key1,key2,cmd} Two keys with one command name, use "or" @@ -3883,7 +3883,7 @@ special faces for some of them. This can be done using the variable @end lisp While using a list with face properties as shown for CANCELED @emph{should} -work, this does not aways seem to be the case. If necessary, define a +work, this does not always seem to be the case. If necessary, define a special face and use that. A string is interpreted as a color. The variable @code{org-faces-easy-properties} determines if that color is interpreted as a foreground or a background color. @@ -5664,7 +5664,7 @@ an item: @orgcmd{C-c C-d,org-deadline} Insert @samp{DEADLINE} keyword along with a stamp. The insertion will happen in the line directly following the headline. Any CLOSED timestamp will be -removed. When called with a prefix arg, an existing deadline will be removed +removed. When called with a prefix arg, an existing deadline will be removed from the entry. Depending on the variable @code{org-log-redeadline}@footnote{with corresponding @code{#+STARTUP} keywords @code{logredeadline}, @code{lognoteredeadline}, and @code{nologredeadline}}, a note will be taken when changing an existing @@ -6216,7 +6216,7 @@ not started at exactly the right moment. @kindex ; Calling @code{org-timer-set-timer} from an Org-mode buffer runs a countdown -timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everwhere else. +timer. Use @kbd{;} from agenda buffers, @key{C-c C-x ;} everywhere else. @code{org-timer-set-timer} prompts the user for a duration and displays a countdown timer in the modeline. @code{org-timer-default-timer} sets the @@ -6393,7 +6393,7 @@ like this: @node Template elements, Template expansion, Capture templates, Capture templates @subsubsection Template elements -Now lets look at the elements of a template definition. Each entry in +Now let's look at the elements of a template definition. Each entry in @code{org-capture-templates} is a list with the following items: @table @var @@ -8262,7 +8262,7 @@ This is a globally available command, and also available in the agenda menu. @vindex org-agenda-exporter-settings Write the agenda view to a file. Depending on the extension of the selected file name, the view will be exported as HTML (extension @file{.html} or -@file{.htm}), Postscript (extension @file{.ps}), PDF (extension @file{.pdf}), +@file{.htm}), PostScript (extension @file{.ps}), PDF (extension @file{.pdf}), and plain text (any other extension). When called with a @kbd{C-u} prefix argument, immediately open the newly created file. Use the variable @code{org-agenda-exporter-settings} to set options for @file{ps-print} and @@ -8477,9 +8477,9 @@ yourself. If you are away from your computer, it can be very useful to have a printed version of some agenda views to carry around. Org-mode can export custom agenda views as plain text, HTML@footnote{You need to install Hrvoje Niksic's -@file{htmlize.el}.}, Postscript, PDF@footnote{To create PDF output, the +@file{htmlize.el}.}, PostScript, PDF@footnote{To create PDF output, the ghostscript @file{ps2pdf} utility must be installed on the system. Selecting -a PDF file will also create the postscript file.}, and iCalendar files. If +a PDF file will also create the PostScript file.}, and iCalendar files. If you want to do this only occasionally, use the command @table @kbd @@ -8489,7 +8489,7 @@ you want to do this only occasionally, use the command @vindex org-agenda-exporter-settings Write the agenda view to a file. Depending on the extension of the selected file name, the view will be exported as HTML (extension @file{.html} or -@file{.htm}), Postscript (extension @file{.ps}), iCalendar (extension +@file{.htm}), PostScript (extension @file{.ps}), iCalendar (extension @file{.ics}), or plain text (any other extension). Use the variable @code{org-agenda-exporter-settings} to set options for @file{ps-print} and for @file{htmlize} to be used during export, for example @@ -8542,7 +8542,7 @@ The extension of the file name determines the type of export. If it is @file{.html}, Org-mode will use the @file{htmlize.el} package to convert the buffer to HTML and save it to this file name. If the extension is @file{.ps}, @code{ps-print-buffer-with-faces} is used to produce -Postscript output. If the extension is @file{.ics}, iCalendar export is +PostScript output. If the extension is @file{.ics}, iCalendar export is run export over all files that were used to construct the agenda, and limit the export to entries listed in the agenda. Any other extension produces a plain ASCII file. @@ -8573,7 +8573,7 @@ set options for the export commands. For example: @end lisp @noindent -This command sets two options for the Postscript exporter, to make it +This command sets two options for the PostScript exporter, to make it print in two columns in landscape format---the resulting page can be cut in two and then used in a paper agenda. The remaining settings modify the agenda prefix to omit category and scheduling information, and @@ -9421,7 +9421,7 @@ the web, while the XOXO format provides a solid base for exchange with a broad range of other applications. @LaTeX{} export lets you use Org-mode and its structured editing functions to easily create @LaTeX{} files. DocBook export makes it possible to convert Org files to many other formats using -DocBook tools. OpenDocumentText export allows seamless colloboration across +DocBook tools. OpenDocumentText export allows seamless collaboration across organizational boundaries. For project management you can create gantt and resource charts by using TaskJuggler export. To incorporate entries with associated times like deadlines or appointments into a desktop calendar @@ -15533,7 +15533,7 @@ chapter about publishing. @i{Jambunathan K} contributed the OpenDocumentText exporter. @item @i{Sebastien Vauban} reported many issues with LaTeX and BEAMER export and -enabled source code highlighling in Gnus. +enabled source code highlighting in Gnus. @item @i{Stefan Vollmar} organized a video-recorded talk at the Max-Planck-Institute for Neurology. He also inspired the creation of a diff --git a/doc/misc/pgg.texi b/doc/misc/pgg.texi index 9cb7a637a05..0de12577b2d 100644 --- a/doc/misc/pgg.texi +++ b/doc/misc/pgg.texi @@ -57,18 +57,18 @@ and various tools for secure communication. PGG also provides a simple user interface to encrypt, decrypt, sign, and verify MIME messages. @ifnottex -@insertcopying +@insertcopying @end ifnottex @menu * Overview:: What PGG is. * Prerequisites:: Complicated stuff you may have to do. * How to use:: Getting started quickly. -* Architecture:: -* Parsing OpenPGP packets:: +* Architecture:: +* Parsing OpenPGP packets:: * GNU Free Documentation License:: The license for this documentation. -* Function Index:: -* Variable Index:: +* Function Index:: +* Variable Index:: @end menu @node Overview @@ -137,10 +137,10 @@ list autoload setting for desired functions as follows. @end lisp @menu -* User Commands:: -* Selecting an implementation:: -* Caching passphrase:: -* Default user identity:: +* User Commands:: +* Selecting an implementation:: +* Caching passphrase:: +* Default user identity:: @end menu @node User Commands @@ -358,13 +358,13 @@ singleton object wrapped with the luna object system. Since PGG was designed for accessing and developing PGP functionality, the architecture had to be designed not just for interoperability but -also for extensiblity. In this chapter we explore the architecture +also for extensibility. In this chapter we explore the architecture while finding out how to write the PGG back end. @menu -* Initializing:: -* Back end methods:: -* Getting output:: +* Initializing:: +* Back end methods:: +* Getting output:: @end menu @node Initializing diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index 8853192af04..37ccc4045be 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi @@ -56,7 +56,7 @@ developing GNU and promoting software freedom.'' @top Supercite @comment node-name, next, previous, up -@insertcopying +@insertcopying The manual is divided into the following chapters. @@ -1877,7 +1877,7 @@ been continuously added through the comments and suggestions of the Supercite mailing list participants. With version 3, Supercite underwent an almost complete rewrite, -benefitting in a number of ways, including vast improvements in the +benefiting in a number of ways, including vast improvements in the speed of performance, a big reduction in size of the code and in the use of Emacs resources, and a much cleaner and flexible internal architecture. Most of this work was internal and not of very great diff --git a/doc/misc/sem-user.texi b/doc/misc/sem-user.texi index b17f1ab7e93..7a363523aa6 100644 --- a/doc/misc/sem-user.texi +++ b/doc/misc/sem-user.texi @@ -382,7 +382,7 @@ them yourself. @deffn Option semanticdb-project-roots The value of this variable is a list of directories (strings) that are project roots. All subdirectories of a project root are considered -part of the same project. This variable can be overriden by +part of the same project. This variable can be overridden by @code{semanticdb-project-root-functions}. @end deffn @@ -608,7 +608,7 @@ of parsing. The default is @code{t}. @node Debugging Idle Time Issues @subsection Debugging Idle Time Issues -If you see an error signalled during idle time, it could be an +If you see an error signaled during idle time, it could be an indication of a more serious issue elsewhere. It is not enough to enable @code{debug-on-error}, because the idle scheduler inhibits the debugger. Instead, use the following commands to debug the error: diff --git a/doc/misc/semantic.texi b/doc/misc/semantic.texi index f3f11d29f17..ad6159feb1a 100644 --- a/doc/misc/semantic.texi +++ b/doc/misc/semantic.texi @@ -306,7 +306,7 @@ Files associated with tags. Goto-tag, file for include, and file for a prototype. @item semantic-tag-ls.el -Language dependant features of a tag, such as parent calculation, slot +Language dependent features of a tag, such as parent calculation, slot protection, and other states like abstract, virtual, static, and leaf. @item semantic-dep.el @@ -349,7 +349,7 @@ This file also provides support for @code{semanticdb-minor-mode}, which automatically associates files with tables in databases so that tags are @emph{saved} while a buffer is not in memory. -The database and tables both also provide applicate cache information, +The database and tables both also provide applicable cache information, and cache flushing system. The semanticdb search routines use caches to save datastructures that are complex to calculate. @@ -606,7 +606,7 @@ Emacs Lisp. It is an LALR parser suitable for complex languages. @c LocalWords: concat concocting const constantness ctxt Decl defcustom @c LocalWords: deffn deffnx defun defvar destructor's dfn diff dir @c LocalWords: doc docstring EDE EIEIO elisp emacsman emph enum -@c LocalWords: eq Exp EXPANDFULL expresssion fn foo func funcall +@c LocalWords: eq Exp EXPANDFULL expression fn foo func funcall @c LocalWords: ia ids iff ifinfo imenu imenus init int isearch itemx java kbd @c LocalWords: keymap keywordtable lang languagemode lexer lexing Ludlam @c LocalWords: menubar metaparent metaparents min minibuffer Misc mode's diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index a4e06ab22f1..0accc6fac43 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -1575,7 +1575,7 @@ password handling. Consider @command{ssh-agent} for @option{ssh}-like methods, or @command{pageant} for @option{plink}-like methods. However, if you cannot apply such native password handling, -@value{tramp} offers altenatives. +@value{tramp} offers alternatives. @anchor{Using an authentication file} diff --git a/etc/AUTHORS b/etc/AUTHORS index f214d5e5515..f8ab274e136 100644 --- a/etc/AUTHORS +++ b/etc/AUTHORS @@ -908,7 +908,7 @@ Derek Upham: changed nxml-mode.el Detlev Zundel: wrote re-builder.el -Devon Sean Mccullough: changed comint.el +Devon Sean McCullough: changed comint.el Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c sound.c w32proc.c diff --git a/etc/ChangeLog b/etc/ChangeLog index b494c8e3c96..48b1acacbf9 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2011-11-14 Juanma Barranquero <lekktu@gmail.com> + + * MAILINGLISTS: Fix typo. + 2011-10-29 Eli Zaretskii <eliz@gnu.org> * themes/wombat-theme.el: Add a coding cookie. (Bug#9905) @@ -371,7 +375,7 @@ 2011-01-04 Jan Moringen <jan.moringen@uni-bielefeld.de> - * NEWS: Extended behaviour of dbus-register-{method,property}. + * NEWS: Extended behavior of dbus-register-{method,property}. 2011-01-02 Kenichi Handa <handa@m17n.org> @@ -4103,7 +4107,7 @@ 2002-02-01 ShengHuo ZHU <zsh@cs.rochester.edu> - * gnus.xpm: Remove garbages. + * gnus.xpm: Remove garbage. 2002-01-27 Pavel Janík <Pavel@Janik.cz> diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS index 17bf4fc3877..04084b58488 100644 --- a/etc/ERC-NEWS +++ b/etc/ERC-NEWS @@ -852,7 +852,7 @@ Only the macros in cl-macs.el are used. ** If possible, re-use channel buffers when reconnecting to a server. ** Text in ERC buffers is now read-only by default. -To get the previous behavior, +To get the previous behavior, ** Changes and additions to modules @@ -1280,7 +1280,7 @@ in XEmacs. the variable `erc-modules' and define once and for all which extension modules you want to use. This unfortunately may require you to change your current erc initialisation code a bit, if you - have some existing customsations. On the other hand, this change + have some existing customizations. On the other hand, this change makes the configuration of extension modules a lot easier for new users. In theory, you should be able to configure all aspects of ERC by using the customize interface, you should no longer really @@ -1342,4 +1342,3 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/etc/JOKES b/etc/JOKES index 9cbba845111..af304e778da 100644 --- a/etc/JOKES +++ b/etc/JOKES @@ -197,7 +197,7 @@ Each Manual's Audience is Completely -Stupified +Stupefied Emacs Means @@ -333,7 +333,7 @@ Easily Mangles, Aborts, Crashes and -Stupifies +Stupefies Extraneous Macros diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS index ef918d3d211..98f10511835 100644 --- a/etc/MAILINGLISTS +++ b/etc/MAILINGLISTS @@ -170,7 +170,7 @@ for yourself in particular, you may have to hire someone. The GNU project maintains a list of people providing such services. It is found in <URL:http://www.gnu.org/prep/SERVICE>. -Anything addressed to the implementors and maintainers of a GNU program +Anything addressed to the implementers and maintainers of a GNU program via a bug-* list, should NOT be sent to the corresponding info-* or help-* list. @@ -172,7 +172,7 @@ server should listen. *** New emacsclient argument --frame-parameters can be used to set the frame parameters of a newly-created graphical frame. +++ -*** If emacsclient shuts down as a result of Emacs signalling an +*** If emacsclient shuts down as a result of Emacs signaling an error, its exit status is 1. +++ *** New emacsclient argument --parent-id ID. @@ -403,16 +403,17 @@ specified by `display-buffer-fallback-action'. display actions, taking precedence over `display-buffer-base-action'. +++ -*** New option `window-nest'. -The new option `window-nest' allows to return the space obtained for -resizing or creating a window more reliably to the window from which -such space was obtained. +*** New option `window-combination-limit'. +The new option `window-combination-limit' allows to return the space +obtained for resizing or creating a window more reliably to the window +from which such space was obtained. +++ -*** New option `window-splits'. -The new option `window-splits' allows to split a window that otherwise -cannot be split because it's too small by stealing space from other -windows in the same combination. +*** New option `window-combination-resize'. +The new option `window-combination-resize' allows to split a window that +otherwise cannot be split because it's too small by stealing space from +other windows in the same combination. Subsequent resizing or deletion +of the window will resize all windows in the same combination as well. +++ *** New commands `maximize-window' and `minimize-window'. @@ -621,6 +622,10 @@ view-diary-entries, list-diary-entries, show-all-diary-entries inserted by the compilation filter function, when calling compilation-filter-hook. +*** `compilation-error-screen-columns' is obeyed in the editing buffer. +So programming language modes can set it, whereas previously only the value +in the *compilation* buffer was used. + ** Customize *** Customize buffers now contain a search field. @@ -1033,33 +1038,31 @@ directionality are not known in advance, without disrupting the layout of the line. ** Window changes - +++ *** Window tree functions are accessible in Elisp. Functions are provided to return the parent, siblings or child windows of any window including internal windows (windows not associated with a buffer) in the window tree. - +++ -*** Window manipulation can deal with internal windows. +**** New function `window-valid-p' gives non-nil for live and internal +windows. ++++ +**** Window manipulation can deal with internal windows. Many window handling functions like `split-window', `delete-window', or `delete-other-windows' as well as the window resizing functions can now act on any window including internal ones. - +++ *** window-total-height/-width vs window-body-height/-width. The function `window-height' has been renamed to `window-total-height' and `window-width' has been renamed to `window-body-width'. The old names are provided as aliases. Two new functions `window-total-width' and `window-body-height' are provided. - +++ *** Window parameters specific to window handling functions. For each window you can specify a parameter to override the default behavior of a number of functions like `split-window', `delete-window' and `delete-other-windows'. The variable `ignore-window-parameters' allows to ignore processing such parameters. - +++ *** New semantics of third argument of `split-window'. The third argument of `split-window' has been renamed to SIDE and can be @@ -1067,17 +1070,14 @@ set to any of the values 'below, 'right, 'above, or 'left to make the new window appear on the corresponding side of the window that shall be split. Any other value of SIDE will cause `split-window' to split the window into two side-by-side windows as before. - +++ *** Window resizing functions. A new standard function for resizing windows called `window-resize' has been introduced. This and all other functions for resizing windows no longer delete any windows when they become too small. - +++ *** Deleting the selected window now selects the most recently selected live window on that frame instead. - +++ *** `adjust-window-trailing-edge' adjustments. `adjust-window-trailing-edge' can now deal with fixed-size windows and @@ -1085,7 +1085,6 @@ is able to resize other windows if a window adjacent to the trailing edge cannot be shrunk any more. This makes its behavior more similar to that of Emacs 21 without compromising, however, its inability to delete windows which was introduced in Emacs 22. - +++ *** Window-local buffer lists. Windows now have local buffer lists. This means that removing a buffer @@ -1093,17 +1092,16 @@ from display in a window will preferably show the buffer previously shown in that window with its previous window-start and window-point positions. This also means that the same buffer may be automatically shown twice even if it already appears in another window. - +++ *** `switch-to-buffer' has a new optional argument FORCE-SAME-WINDOW, which if non-nil requires the buffer to be displayed in the currently selected window, signaling an error otherwise. If nil, another window can be used, e.g. if the selected one is strongly dedicated. - ++++ *** `split-window-vertically' and `split-window-horizontally' renamed to `split-window-below' and `split-window-right' respectively. The old names are kept as aliases. - ++++ *** Display actions **** The second arg to `display-buffer' and `pop-to-buffer' is now @@ -1246,7 +1244,7 @@ argument is supplied (see Trash changes, above). ** `facemenu-read-color' is now an alias for `read-color'. The command `read-color' now requires a match for a color name or RGB -triplet, instead of signalling an error if the user provides a invalid +triplet, instead of signaling an error if the user provides a invalid input. ** Tool-bars can display separators. @@ -1294,6 +1292,8 @@ functions. It's easiest to use these functions through STARTTLS opportunistically or use plain SSL, depending on your needs. Only versions 2.8.x and higher or GnuTLS have been tested. +[FIXME: this statement needs clarifying, given that GnuTLS >= 2.6.6 +is the test used by configure.] *** gnutls-log-level Set `gnutls-log-level' higher than 0 to get debug output. 1 is for diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17 index 89856429b1d..aa8c8839d3c 100644 --- a/etc/NEWS.1-17 +++ b/etc/NEWS.1-17 @@ -963,7 +963,7 @@ a slash is appended to it. * Undo can clear modified-flag. If you undo changes in a buffer back to a state in which the -buffer was not considered "modified", then it is labelled as +buffer was not considered "modified", then it is labeled as once again "unmodified". * M-x run-lisp. @@ -996,7 +996,7 @@ with no confirmation. view-buffer selects the named buffer, view-file finds the named file; the resulting buffer is placed into view-mode (a recursive edit). The normal emacs commands are not available. Instead a set of special commands is -provided which faclitate moving around in the buffer, searching and +provided which facilitate moving around in the buffer, searching and scrolling by screenfuls. Exiting view-mode returns to the buffer in which the view-file or view-buffer command was given. Type ? or h when viewing for a complete list of view commands. @@ -1074,7 +1074,7 @@ Another `t' switches back to the usual display. * Rmail commands `a' and `k' set message attributes. `a' adds an attribute and `k' removes one. You specify -the attrbute by name. You can specify either a built-in +the attribute by name. You can specify either a built-in flag such as "deleted" or "filed", or a user-defined keyword (anything not recognized as built-in). @@ -1090,7 +1090,7 @@ the messages should have. * Interface to MH mail system. mh-e is a front end for GNU emacs and the MH mail system. It -provides a friendly and convient interface to the MH commands. +provides a friendly and convenient interface to the MH commands. To read mail, invoke mh-rmail. This will inc new mail and display the scan listing on the screen. To see a summary of the mh-e commands, @@ -1612,7 +1612,7 @@ Changes in Emacs 13 The string "../lisp" now adds to the front of the load-path used for searching for Lisp files during Emacs initialization. It used to replace the path specified in paths.h entirely. - Now the directory ../lisp is searched first and the directoris + Now the directory ../lisp is searched first and the directories specified in paths.h are searched afterward. @@ -1670,7 +1670,7 @@ Changes in Emacs 1.12 the string, it is used unchanged. One way this feature can be used is to fix bad keyboard - designes. For example, on some terminals, Delete is + designs. For example, on some terminals, Delete is Shift-Underscore. Since Delete is a more useful character than Underscore, it is an improvement to make the unshifted character Delete and the shifted one Underscore. This can @@ -2423,7 +2423,7 @@ Changes in Emacs 1.1 or show the text or subheadings under each heading line independently. Hidden text or subheadings are invisibly attached to the end of the preceding heading line, so that - if you kill the hading line and yank it back elsewhere + if you kill the heading line and yank it back elsewhere all the invisible lines accompany it. All editing commands treat hidden outline-mode lines @@ -2446,7 +2446,7 @@ Changes in Emacs 1.1 containing *'s, etc, all processed by the shell). Also, you can dired more than one directory; dired names the buffer according to the filespec or directory name. Reinvoking - dired on a directory already direded just switches back to + dired on a directory already diredded just switches back to the same directory used last time; do M-x revert if you want to read in the current contents of the directory. @@ -2530,4 +2530,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. Local variables: mode: text end: - diff --git a/etc/NEWS.19 b/etc/NEWS.19 index 90d96c12fb8..6c1c5483809 100644 --- a/etc/NEWS.19 +++ b/etc/NEWS.19 @@ -1729,7 +1729,7 @@ projects to define project-specific structures. It also enables the use of etags and TAGS files for languages not supported by etags. The Emacs manual section on Tags contains explanations and examples -for Emacs's DEFVAR, VHDL, Cobol, Postscript and TCL. +for Emacs's DEFVAR, VHDL, Cobol, PostScript and TCL. ** Various mode-specific commands that used to be bound to C-c LETTER have been moved. diff --git a/etc/NEWS.20 b/etc/NEWS.20 index c76ddb2485e..332eec60535 100644 --- a/etc/NEWS.20 +++ b/etc/NEWS.20 @@ -696,7 +696,7 @@ pasting operations. ** You can specify the printer to use for commands that do printing by setting the variable `printer-name'. Just what a printer name looks like depends on your operating system. You can specify a different -printer for the Postscript printing commands by setting +printer for the PostScript printing commands by setting `ps-printer-name'. ** Emacs now supports on-the-fly spell checking by the means of a @@ -2047,7 +2047,7 @@ standard fontset are created automatically. If you specify a default ASCII font with the `Font' resource or `-fn' argument, a fontset is generated from it. This works by replacing the -FOUNDARY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name +FOUNDRY, FAMILY, ADD_STYLE, and AVERAGE_WIDTH fields of the font name with `*' then using this to specify a fontset. This fontset's short name is `fontset-startup'. @@ -3494,9 +3494,9 @@ not by default. Use --members to turn this feature on. *** Java is tagged like C++. In addition, "extends" and "implements" constructs are tagged. Files are recognized by the extension .java. -*** Etags can now handle programs written in Postscript. Files are -recognized by the extensions .ps and .pdb (Postscript with C syntax). -In Postscript, tags are lines that start with a slash. +*** Etags can now handle programs written in PostScript. Files are +recognized by the extensions .ps and .pdb (PostScript with C syntax). +In PostScript, tags are lines that start with a slash. *** Etags now handles Objective C and Objective C++ code. The usual C and C++ tags are recognized in these languages; in addition, etags diff --git a/etc/NEWS.21 b/etc/NEWS.21 index 47f61a13e3b..c3c54d8bb01 100644 --- a/etc/NEWS.21 +++ b/etc/NEWS.21 @@ -446,7 +446,7 @@ This behavior may be disabled by customizing the option ** Polish, Czech, German, and French translations of Emacs' reference card have been added. They are named `pl-refcard.tex', `cs-refcard.tex', -`de-refcard.tex' and `fr-refcard.tex'. Postscript files are included. +`de-refcard.tex' and `fr-refcard.tex'. PostScript files are included. ** An `Emacs Survival Guide', etc/survival.tex, is available. @@ -850,7 +850,7 @@ default). *** If Emacs was invoked with the `-q' or `--no-init-file' options, it does not allow you to save customizations in your `~/.emacs' init file. This is because saving customizations from such a session would -wipe out all the other customizationss you might have on your init +wipe out all the other customizations you might have on your init file. ** If Emacs was invoked with the `-q' or `--no-init-file' options, it @@ -2189,7 +2189,7 @@ variables are tagged. *** New language Python: def and class at the beginning of a line are tags. -*** .ss files are Scheme files, .pdb is Postscript with C syntax, .psw is +*** .ss files are Scheme files, .pdb is PostScript with C syntax, .psw is for PSWrap. ** Changes in etags.el diff --git a/etc/NEWS.23 b/etc/NEWS.23 index 5b170231bbd..3a222d50d4c 100644 --- a/etc/NEWS.23 +++ b/etc/NEWS.23 @@ -1182,7 +1182,7 @@ run processes remotely. matches a regexp. *** The value of comment-style now defaults to `indent'. -Thefore, comment-start markers are inserted at the current indentation +Therefore, comment-start markers are inserted at the current indentation of the region to comment, rather than the leftmost column. *** The new commands `pp-macroexpand-expression' and @@ -1235,8 +1235,8 @@ details, see the commentary in doc-view.el. PDF and DVI files are now opened in Doc View mode by default. -In Postcript mode, C-c C-c launches Doc View minor mode for viewing -the postscript file. +In PostScript mode, C-c C-c launches Doc View minor mode for viewing +the PostScript file. ** EasyPG provides an interface to the GNU Privacy Guard (GnuPG). It includes a GnuPG keyring browser, cryptographic operations on @@ -2102,7 +2102,7 @@ function to use for searching in `query-replace-regexp', *** New keymap `search-map' bound to `M-s' provides global bindings for search related commands. -*** New keymap `multi-query-replace-map' contains additonal keys bound +*** New keymap `multi-query-replace-map' contains additional keys bound to `automatic-all' and `exit-current' for multi-buffer interactive replacement. *** The variable `inhibit-changing-match-data', if non-nil, prevents @@ -2529,4 +2529,3 @@ Local variables: mode: outline paragraph-separate: "[ ]*$" end: - diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP index fcde9727dff..4aa1dca93f2 100644 --- a/etc/NEXTSTEP +++ b/etc/NEXTSTEP @@ -38,7 +38,7 @@ meantime. Release History --------------- -1990-1992 1.0-3.0 (?) Michael Brouwer's socket/terminal communication +1990-1992 1.0-3.0 (?) Michael Brouwer's socket/terminal communication based version (GUI ran as a separate process.) 1993/10/25 3.0.1 Last (?) release of Brouwer version. Supports @@ -126,7 +126,7 @@ Release History rendering for synthetic italic fonts. Further improved menu parsing. Use system highlight color. Added previous- and next-mark history - navigation commmands bound to M-p,M-n. + navigation commands bound to M-p,M-n. Miscellaneous bug fixes. 2005/08/04 8.0-rc5 All internal string handling changed to UTF-8. @@ -146,7 +146,7 @@ Release History handling now added. Transparency (e.g., M-x set-background-color ARGB88FFFFFF) improved: only the background is made transparent. - Cursor drawing glitches fixed. Preferences + Cursor drawing glitches fixed. Preferences handling improved. Fixed some portability problems on Tiger and Puma. @@ -185,7 +185,7 @@ Release History rendering, pasting, Color panel. Added function ns-set-background-alpha to work around inability to customize with numeric colors. - + 2006/12/24 9.0-rc1 Reworked font handling and text rendering to use Kenichi Handa's new font back-end system. Font sets are now supported and automatically diff --git a/etc/PROBLEMS b/etc/PROBLEMS index e85972f0bfd..57a3387ee40 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -1250,7 +1250,7 @@ be carried out at the same time: 4) Use lbxproxy on the remote end of the connection. This is an interface to the low bandwidth X extension in most modern X servers, which improves performance dramatically, at the slight expense of correctness - of the X protocol. lbxproxy acheives the performance gain by grouping + of the X protocol. lbxproxy achieves the performance gain by grouping several X requests in one TCP packet and sending them off together, instead of requiring a round-trip for each X request in a separate packet. The switches that seem to work best for emacs are: @@ -165,7 +165,7 @@ Change them to use report-emacs-bug. like make-backup-file-name-function for non-numeric backup files. ** `dired-mode' should specify the semantics of `buffer-modified-p' for -dired buffers and DTRT WRT `auto-revert-mode'. +dired buffers and DTRT WRT `auto-revert-mode'. ** Check uses of prin1 for error-handling. http://lists.gnu.org/archive/html/emacs-devel/2008-08/msg00456.html @@ -325,7 +325,7 @@ typically due to pilot errors and should thus be in debug-ignored-errors. ** Beefed-up syntax-tables. *** recognize multi-character syntactic entities like `begin' and `end'. -*** nested string-delimiters (for Postscript's (foo(bar)baz) strings). +*** nested string-delimiters (for PostScript's (foo(bar)baz) strings). *** support for infix operators (with precedence). *** support for the $ (paired delimiter) in parse-partial-sexp. *** support for hook-chars whose effect on the parsing-state is specified @@ -1043,7 +1043,7 @@ was an error in the namespace URI. **** Better recovery from ill-formed XML declarations. -*** Useability improvements +*** Usability improvements **** Should print a "Parsing..." message during long movements. @@ -1243,4 +1243,3 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt index 80a652ba25f..9132ece533e 100644 --- a/etc/gnus-tut.txt +++ b/etc/gnus-tut.txt @@ -188,7 +188,7 @@ remove all hilit code from all the Gnus hooks (`gnus-group-prepare-hook', `gnus-summary-prepare-hook' and `gnus-summary-article-hook'). (Well, at the very least the first two.) Gnus provides various integrated functions for highlighting, -which are both faster and more accurated. +which are both faster and more accurate. There is absolutely no chance, whatsoever, of getting Gnus to work with Emacs 18. It won't even work on Emacsen older than Emacs @@ -288,5 +288,3 @@ me the patches, but one can't have everything. If you have any questions on usage, the "ding@ifi.uio.no" mailing list is where to post the questions. - - diff --git a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png Binary files differindex a6bc3e99a7a..a6bc3e99a7a 100755..100644 --- a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png +++ b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png diff --git a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png Binary files differindex e70d075690a..e70d075690a 100755..100644 --- a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png +++ b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index d45392e93dd..b66a17a4be5 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt @@ -55,7 +55,7 @@ goal %% (define-lex wisent-{{TARGETMODE}}-lexer - "Lexical analzer to handle {{TARGETMODE}} buffers." + "Lexical analyzer to handle {{TARGETMODE}} buffers." ;; semantic-lex-newline semantic-lex-ignore-whitespace semantic-lex-ignore-newline diff --git a/etc/themes/manoj-dark-theme.el b/etc/themes/manoj-dark-theme.el index bd6bbaa88a2..b06678636c7 100644 --- a/etc/themes/manoj-dark-theme.el +++ b/etc/themes/manoj-dark-theme.el @@ -37,7 +37,7 @@ ;; (blueish) or mail (greenish), have states (large number of under ;; messages, normal, and empty). The large number unread groups have ;; highest luminance (appear brighter), and the empty one have lower -;; luminance (appear greyer), but have the same chroma and saturation. +;; luminance (appear grayer), but have the same chroma and saturation. ;; Sub states and group priorities are rendered using a color series ;; which has constant luminance and saturation, and vary in hue by a ;; constant separation -- so all the related groups have the same @@ -52,8 +52,8 @@ ;; reading mail/USENET. ;; In the message itself, quoted mail messages from different people -;; are color coordinated, with high contrast beteen citations that are -;; close to each other in the heirarchy, so it is less likely that one +;; are color coordinated, with high contrast between citations that are +;; close to each other in the hierarchy, so it is less likely that one ;; misunderstands who said what in a long conversation. ;; The following scheme covers programming languages, Gnus, Erc, mail, diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja index e4917d40987..d50727ceb82 100644 --- a/etc/tutorials/TUTORIAL.ja +++ b/etc/tutorials/TUTORIAL.ja @@ -524,7 +524,7 @@ C-_ $B$d(B C-x u $B$O?tCM0z?t$r7+$jJV$72s?t$H2r<a$7$^$9!#(B >> "foo" $B$H$$$&L>$N%U%!%$%k$r:n$j$^$7$g$&!#(BC-x C-f foo <Return> $B$G$9!#(B $B2?$+J8>O$rF~$l!"JT=8$7!"(BC-x C-s $B$G(B "foo" $B$r%;!<%V$7$F2<$5$$!#(B - $B:G8e$K(B C-x C-f TUTORIAL.ja <Retrun> $B$H%?%$%W$7(B + $B:G8e$K(B C-x C-f TUTORIAL.ja <Return> $B$H%?%$%W$7(B $BF~Lg%,%$%I$KLa$j$^$7$g$&!#(B Emacs $B$O%U%!%$%k$NFbMF$r%P%C%U%!!J(Bbuffer$B!K$H8F$P$l$k$b$N$NCf$K3JG<$7$F(B @@ -890,7 +890,7 @@ ESC $B$O$=$l<+BN$,0l$D$NJ8;z$G=$>~%-!<$G$O$J$$$+$i$G$9!#(B >> M-x make-frame <Return> $B$H%?%$%W$7$F!"?7$7$$%U%l!<%`$,I=<($5$l$k$N(B $B$r3NG'$7$^$7$g$&!#(B - + $B85$N%U%l!<%`$G$d$C$F$$$?$3$H$O$J$s$G$b$3$N?7$7$$%U%l!<%`$G$b$G$-$^$9!#(B $B:G=i$N%U%l!<%`$H$=$N8e$K:n$i$l$k%U%l!<%`$G0c$$$O$"$j$^$;$s!#(B @@ -1083,4 +1083,3 @@ GNU Emacs to your friends. Help stamp out software obstructionism ;;; Local Variables: ;;; coding: iso-2022-jp ;;; End: - diff --git a/leim/CXTERM-DIC/README b/leim/CXTERM-DIC/README index d8731740a79..34853091cf5 100644 --- a/leim/CXTERM-DIC/README +++ b/leim/CXTERM-DIC/README @@ -1,5 +1,5 @@ All *.tit files in this directory are dictionary files to use with -the program cxterm. Their source and copyright status are categorised +the program cxterm. Their source and copyright status are categorized into these four groups. (1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit) diff --git a/leim/ChangeLog b/leim/ChangeLog index 6130bf57800..75dde2bcd18 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,4 +1,4 @@ -2011-09-27 Jambunathan K <kjambunathan@gmail.com> +2011-09-27 Jambunathan K <kjambunathan@gmail.com> * quail/indian.el (quail-tamil-itrans-misc-table): Delete it. (quail-tamil-itrans-numerics-and-symbols-table) @@ -251,7 +251,7 @@ * quail/hangul.el (hangul-im-keymap): Add binding of key Hangul_Hanja. -2009-05-04 Simon Leinen <simon.leinen@switch.ch> (tiny change) +2009-05-04 Simon Leinen <simon.leinen@switch.ch> (tiny change) * Makefile.in (install): Avoid using $$(..) construct, for Solaris compatibility. diff --git a/leim/MISC-DIC/README b/leim/MISC-DIC/README index 95efbd4d27b..cea30b350fe 100644 --- a/leim/MISC-DIC/README +++ b/leim/MISC-DIC/README @@ -1,5 +1,5 @@ The source and copyright status of dictionary files in this directory -are categorised into these three groups. +are categorized into these three groups. (1) cangjie-table.b5 cangjie-table.cns diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el index 824048534e0..88be0a3b7d0 100644 --- a/leim/quail/cyrillic.el +++ b/leim/quail/cyrillic.el @@ -42,7 +42,7 @@ ;; in typewriters for ages but it has been superseded on desktops by ;; a variation of this layout, implemented in M$ Windows software. ;; The Windows layout is greatly preferred because of the comma and -;; period being placed more conviniently and, of course, because of +;; period being placed more conveniently and, of course, because of ;; the popularity of Windows software. This layout is a common option ;; in X Windows and console layouts for GNU/Linux. [See ;; `russian-computer' below.] @@ -163,7 +163,7 @@ ;; commented out because quail-update-leim-list-file ignores ;; commented-out lines. (if nil - (quail-define-package + (quail-define-package "cyrillic-jcuken" "Russian" ",L69(B" nil ",L9FC:5=(B Russian typewriter layout (ISO 8859-5 encoding).")) diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el index 425a0591c9d..559841e8905 100644 --- a/leim/quail/ipa.el +++ b/leim/quail/ipa.el @@ -149,8 +149,8 @@ incorrectly, as separate from the modified glyphs.") ("P" "ɸ") ;; Voiceless bilabial fricative U+0278 ("Q" "ɣ") ;; Voiced velar fricative U+0263 ("R" ["ʀ" ;; Alveolar trill U+0280 - "ɚ"]) ;; Rhotacised schwa U+025A - ("@<r>" "ɚ") ;; Mid central rhotacised vowel U+025A + "ɚ"]) ;; Rhotacized schwa U+025A + ("@<r>" "ɚ") ;; Mid central rhotacized vowel U+025A ("S" "ʃ") ;; Voiceless postalveolar fricative U+0283 ("tS" ["ʧ" ;; Voiceless postalveolar affricate U+02A7 "tʃ" ;; U+0074 U+0283 @@ -170,19 +170,19 @@ incorrectly, as separate from the modified glyphs.") ("a~" "ã") ;; Low central unrounded vowel, nasal U+00E3 ("o~" "õ") ;; Upper-mid back rounded vowel, nasal U+00F5 ("u~" "ũ") ;; High back rounded vowel, nasal U+0169 - ("~" "̃") ;; +Nasalised modifier U+0303 + ("~" "̃") ;; +Nasalized modifier U+0303 (":" "ː") ;; +Long modifier U+02D0 ("-" "̩") ;; +Syllabic modifier U+0329 ("." "̣") ;; +Retroflex modifier U+0323 ("`" "ʼ") ;; +Ejective modifier U+02BC ("[" "̪") ;; +Dental modifier U+032A - (";" "ʲ") ;; +Palatalised modifier U+02B2 - ("<H>" "̴") ;; +Pharyngealised modifier U+0334 + (";" "ʲ") ;; +Palatalized modifier U+02B2 + ("<H>" "̴") ;; +Pharyngealized modifier U+0334 ("<h>" "ʰ") ;; +Aspirated modifier U+02B0 ("<o>" ["̥" ;; +Voiceless modifier U+0325 "˚"]) ;; +Unexploded modifier U+02DA - ("<r>" "ʳ") ;; +Rhotacised modifier U+02B3 - ("<w>" "ʷ") ;; +Labialised modifier U+02B7 + ("<r>" "ʳ") ;; +Rhotacized modifier U+02B3 + ("<w>" "ʷ") ;; +Labialized modifier U+02B7 ("<?>" "ʱ") ;; +Murmured modififer U+02B1 ("b<trl>" "ʙ") ;; Bilabial trill U+0299 @@ -237,7 +237,7 @@ incorrectly, as separate from the modified glyphs.") ("u\"" "ʉ") ;; High central rounded vowel U+0289 ("@<umd>" "ɘ") ;; Upper-mid central unrounded vowel U+0258 - ("R<umd>" "ɝ") ;; Upper-mid central rhotacised vowel U+025D + ("R<umd>" "ɝ") ;; Upper-mid central rhotacized vowel U+025D ("@." "ɵ") ;; Mid central rounded vowel U+0275 ("V\"" "ɜ") ;; Lower-mid central unrounded vowel U+025C @@ -416,7 +416,7 @@ displays them, incorrectly, as separate from the modified glyphs.") (":\\" "ˑ") ;; Half-long U+02D1 ("@" "ə") ;; Schwa U+0259 ("@\\" "ɘ") ;; Close-mid central unrounded vowel U+0258 - ("@`" "ɚ") ;; Rhotacised schwa U+025A + ("@`" "ɚ") ;; Rhotacized schwa U+025A ("{" "æ") ;; Near-open front unrounded vowel U+00E6 ("}" "ʉ") ;; Close central rounded vowel U+0289 ("1" "ɨ") ;; Close central unrounded vowel U+0268 @@ -424,7 +424,7 @@ displays them, incorrectly, as separate from the modified glyphs.") ("3" "ɜ") ;; Open-mid central unrounded vowel U+025C ("3\\" "ɞ") ;; Open-mid central rounded vowel U+025E ("4" "ɾ") ;; Alveolar flap U+027E - ("5" "ɫ") ;; Velarised alveolar lateral approximant U+026B + ("5" "ɫ") ;; Velarized alveolar lateral approximant U+026B ("6" "ɐ") ;; Near-open central vowel U+0250 ("7" "ɤ") ;; Close-mid back unrounded vowel U+0264 ("8" "ɵ") ;; Close-mid central rounded vowel U+0275 @@ -451,7 +451,7 @@ displays them, incorrectly, as separate from the modified glyphs.") ;; them, and the recipient's client is capable, they will get through, ;; though. - ("_\"" "̈") ;; Centralised U+0308 + ("_\"" "̈") ;; Centralized U+0308 ("_+" "̟") ;; Advanced U+031F ("_-" "̠") ;; Retracted U+0320 ("_/" "ˇ") ;; Rising tone U+02C7 @@ -459,7 +459,7 @@ displays them, incorrectly, as separate from the modified glyphs.") ("_=" "̩") ;; Syllabic U+0329 ("=" "̩") ;; Syllabic U+0329 ("_>" "ʼ") ;; Ejective U+02BC - ("_?\\" "ˤ") ;; Pharyngealised U+02E4 + ("_?\\" "ˤ") ;; Pharyngealized U+02E4 ("_\\" "ˆ") ;; Falling Tone U+02C6 ("_^" "̯") ;; Non-syllabic U+032F ("_}" "̚") ;; No audible release U+031A @@ -473,17 +473,17 @@ displays them, incorrectly, as separate from the modified glyphs.") ;; _B_L omitted, no Unicode code point for "low rising tone." ("_c" "̜") ;; Less rounded U+031C ("_d" "̪") ;; Dental U+032A - ("_e" "̴") ;; Velarised or pharyngeal U+0334 + ("_e" "̴") ;; Velarized or pharyngeal U+0334 ("<F>" "↙") ;; Global fall; SOUTH EAST ARROW; may be a bit smaller than ;; intended. ("_F" "̂") ;; Falling tone U+0302 - ("_G" "ˠ") ;; Velarised U+02E0 + ("_G" "ˠ") ;; Velarized U+02E0 ("_H" "́") ;; High tone U+0301 ;; "_H_T omitted, no Unicode code point for "high rising tone" ("_h" "ʰ") ;; Aspirated U+02B0 - ("_j" "ʲ") ;; Palatalised U+02B2 - ("'" "ʲ") ;; Palatalised U+02B2 + ("_j" "ʲ") ;; Palatalized U+02B2 + ("'" "ʲ") ;; Palatalized U+02B2 ("_k" "̰") ;; Creaky voice U+0330 ("_L" "̀") ;; Low tone U+0300 ("_l" "ˡ") ;; Lateral release U+02E1 @@ -501,9 +501,9 @@ displays them, incorrectly, as separate from the modified glyphs.") ("_T" "̋") ;; Extra high tone U+030B ("_t" "̤") ;; Breathy voice U+0324 ("_v" "̬") ;; Voiced U+032C - ("_w" "ʷ") ;; Labialised U+02B7 + ("_w" "ʷ") ;; Labialized U+02B7 ("_X" "̆") ;; Extra-short U+0306 - ("_x" "̽")) ;; Mid-centralised U+033D + ("_x" "̽")) ;; Mid-centralized U+033D ;; Putting in place rules for the implosives like for the others above ;; breaks the "_<diacritic>" rules for b, d, g, G and J a little--you need diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el index e1a95d193c8..c5c7061663e 100644 --- a/leim/quail/tibetan.el +++ b/leim/quail/tibetan.el @@ -337,7 +337,7 @@ ("(" . "$(7!l(B") ("0" . "$(7!P(B") (")" . "$(7!m(B") -;;; ("-" ) ; enphatic, not yet supported +;;; ("-" ) ; emphatic, not yet supported ;;; ("_" ) ; id. ;;; ("=" ) ; special sign, not yet supported ("+" . "$(7!A(B") @@ -427,7 +427,7 @@ 1. Vowel 'a' should be typed explicitly by the key 'A'. This is really inconvenient. But to make the coding - scheme clear, it is desirable to have an explicite + scheme clear, it is desirable to have an explicit vowel sign for 'a'. 2. Tsheg is assigned to SPC key. You can input a space by typing '>'. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index a8f9a0ac4be..d043f41962e 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,7 @@ +2011-11-14 Dan Nicolaescu <dann@ics.uci.edu> + + * Makefile.in (all): Make sure "all" is the first target. + 2011-10-27 Juanma Barranquero <lekktu@gmail.com> * emacsclient.c (w32_getenv): Silence compiler warnings. @@ -3638,7 +3642,7 @@ (lang_names): Add a NULL member for every entry, added an entry for makefiles. (Makefile_targets): New function. - (Texinfo_nodes): Rename from Texinfo_fuctions and made + (Texinfo_nodes): Rename from Texinfo_functions and made it conformant to the style of the rest of the code. 2001-01-13 Gerd Moellmann <gerd@gnu.org> @@ -4630,9 +4634,9 @@ 1997-05-12 Francesco Potortì <F.Potorti@cnuce.cnr.it> - * etags.c (Cplusplus_suffixes): .pdb is Postscript with C syntax. - (Postscript_suffixes): .ps is Postscript. - (lang_names): Add Postscript. + * etags.c (Cplusplus_suffixes): .pdb is PostScript with C syntax. + (Postscript_suffixes): .ps is PostScript. + (lang_names): Add postscript. (Postscript_functions): New function. (TEX_decode_env): Close minor memory leak. (just_read_file): Correct the char number of the tag. @@ -5130,7 +5134,7 @@ 1996-03-15 Anders Lindgren <andersl@csd.uu.se> - * etags.c: Prolog language totaly rewritten. + * etags.c: Prolog language totally rewritten. (Prolog_functions): Rewritten from scratch. (skip_comment, prolog_getit): Removed. (prolog_skip_comment): New function, like old skip_comment. diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 499305ec512..c5e117f66f9 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -175,11 +175,11 @@ ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} +all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS} + LOADLIBES = ../lib/libgnu.a $(LIBS_SYSTEM) $(EXE_FILES): ../lib/libgnu.a -all: ${EXE_FILES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS} ${STAMP_INST_SCRIPTS} ${STAMP_SCRIPTS} - ## These targets copy the scripts into the build directory so that ## they can be run from there in an uninstalled Emacs. ## Nothing to do if pwd = srcdir. diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c index 76aa21884de..56e17c100be 100644 --- a/lib-src/emacsclient.c +++ b/lib-src/emacsclient.c @@ -1193,7 +1193,7 @@ handle_sigtstp (int signalnum) send_to_emacs (emacs_socket, "-suspend \n"); /* Unblock this signal and call the default handler by temporarily - changing the handler and resignalling. */ + changing the handler and resignaling. */ sigprocmask (SIG_BLOCK, NULL, &set); sigdelset (&set, signalnum); signal (signalnum, SIG_DFL); diff --git a/lib-src/etags.c b/lib-src/etags.c index cdcc6461a64..b739e8f00c5 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c @@ -611,7 +611,7 @@ using `--declarations'."; static const char *Cplusplus_suffixes [] = { "C", "c++", "cc", "cpp", "cxx", "H", "h++", "hh", "hpp", "hxx", "M", /* Objective C++ */ - "pdb", /* Postscript with C syntax */ + "pdb", /* PostScript with C syntax */ NULL }; static const char Cplusplus_help [] = "In C++ code, all the tag constructs of C code are tagged. (Use\n\ @@ -4846,7 +4846,7 @@ Lua_functions (FILE *inf) /* - * Postscript tags + * PostScript tags * Just look for lines where the first character is '/' * Also look at "defineps" for PSWrap * Ideas by: @@ -6097,7 +6097,7 @@ readline (linebuffer *lbp, FILE *stream) lineno += 1; /* increment global line number */ charno += result; /* increment global char number */ - /* Honour #line directives. */ + /* Honor #line directives. */ if (!no_line_directive) { static bool discard_until_line_directive; diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c index 9fba51a33de..e335617df4d 100644 --- a/lib-src/update-game-score.c +++ b/lib-src/update-game-score.c @@ -346,7 +346,7 @@ read_scores (const char *filename, struct score_entry **scores, int *count) return -1; while ((readval = read_score (f, &ret[scorecount])) == 0) { - /* We encoutered an error */ + /* We encountered an error. */ if (readval < 0) return -1; scorecount++; diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in index 6b451dd14e1..d5304258879 100644 --- a/lib/makefile.w32-in +++ b/lib/makefile.w32-in @@ -50,7 +50,9 @@ all: stamp_BLD $(ALL) ### TAGS ### -TAGS: +FRC: + +TAGS: FRC ../lib-src/$(BLD)/etags.exe *.c *.h ### DEPENDENCIES ### diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4591b9b9281..69e5d5571d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,428 @@ +2011-11-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/smie.el: Improve warnings and conflict detection. + (smie-warning-count): New var. + (smie-set-prec2tab): Use it. + (smie-bnf->prec2): Improve warnings. Add docstring. + (smie-bnf--closer-alist): Rename from smie-bnf-closer-alist. + (smie-bnf--set-class): New function. + (smie-bnf--classify): Rename from smie-bnf-classify. Rewrite to fix + corner case. + + * progmodes/compile.el: Obey compilation-first-column in dest buffer. + (compilation-error-properties, compilation-move-to-column): + Handle compilation-first-column while in the target buffer. + + * progmodes/cc-engine.el (c-remove-stale-state-cache-backwards): + Don't hardcode point-min==1. + + * eshell/esh-cmd.el (eshell-do-eval): Handle `setq' (bug#9907). + (eshell-rewrite-for-command): Remove workaround. + (eshell-do-pipelines, eshell-do-pipelines-synchronously) + (eshell-do-eval, eshell-exec-lisp): Avoid gratuitous setq. + * eshell/esh-util.el (eshell-condition-case, eshell-for): Use declare. + + * files-x.el (modify-file-local-variable): Obey commenting conventions. + +2011-11-17 Glenn Morris <rgm@gnu.org> + + * emacs-lisp/autoload.el (autoload-generate-file-autoloads): + Ignore buffer-local generated-autoload-file if it is the same + as the global value. (Bug#10049) + +2011-11-17 Juanma Barranquero <lekktu@gmail.com> + + * textmodes/reftex-toc.el (reftex-toc-return-marker, reftex-toc-help) + (reftex-toc, reftex-toc, reftex-toc-dframe-p, reftex-toc-next-heading) + (reftex-toc-previous-heading, reftex-toc-max-level) + (reftex-toc-goto-line-and-hide, reftex-toc-show-calling-point) + (reftex-toc-quit, reftex-toc-revert, reftex-toc-jump) + (reftex-toc-do-promote, reftex-toc-promote-prepare) + (reftex-toc-promote-action, reftex-toc-extract-section-number) + (reftex-toc-load-all-files-for-promotion, reftex-toc-rename-label) + (reftex-toc-rename-label, reftex-toc-visit-location) + (reftex-toc-visit-location, reftex-toggle-auto-toc-recenter) + (reftex-toggle-auto-toc-recenter, reftex-toggle-auto-toc-recenter) + (reftex-make-separate-toc-frame): Fix typos, and use TOC consistently, + leaving "*toc*" only for references to the buffer. + +2011-11-17 Martin Rudalics <rudalics@gmx.at> + + * window.el (window-resize, delete-window, split-window): + Replace window-splits by window-combination-resize. + * cus-start.el (window-splits): Replace by + window-combination-resize. + +2011-11-17 Glenn Morris <rgm@gnu.org> + + * progmodes/sh-script.el (sh-font-lock-keywords-var): + Make bash entry derive from sh entry, not shell entry. + +2011-11-16 Michael Albinus <michael.albinus@gmx.de> + + * net/tramp.el (tramp-handle-file-truename): Cache only the local + file name. + + * net/tramp-cache.el (tramp-flush-file-property): Flush also + properties of linked files. (Bug#9879) + +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * menu-bar.el (menu-bar-file-menu): + * printing.el (pr-ps-utility): + * calendar/icalendar.el (icalendar, icalendar--convert-tz-offset) + (icalendar--convert-to-ical, icalendar--convert-ordinary-to-ical) + (icalendar--convert-weekly-to-ical, icalendar--convert-yearly-to-ical) + (icalendar--convert-sexp-to-ical, icalendar--convert-block-to-ical) + (icalendar--convert-float-to-ical, icalendar--convert-date-to-ical) + (icalendar--convert-cyclic-to-ical) + (icalendar--convert-anniversary-to-ical, icalendar-import-buffer) + (icalendar--convert-ical-to-diary) + (icalendar--convert-recurring-to-diary) + (icalendar--convert-non-recurring-all-day-to-diary) + (icalendar-import-format-sample): + * progmodes/idlw-shell.el (idlwave-shell-mode): + * progmodes/vhdl-mode.el (vhdl-mode, vhdl-print-two-column) + (vhdl-print-customize-faces, vhdl-mode, vhdl-ps-print-settings) + (vhdl-ps-print-init): Fix typos. + +2011-11-16 Ken Manheimer <ken.manheimer@gmail.com> + + * allout.el, allout-widgets.el (file metadata): Attribute copyright to + FSF and collapse date sequence, obscure author/maintainer email address + better, remove extra version line, track relocation of author's webpage. + + * progmodes/python.el (python-pdbtrack-input-prompt) + (python-pdbtrack-track-stack-file): Adjust to recognize ipdb as well as + regular python pdb prompts. Adjustments shamelessly taken exactly as + suggested in EmacsWiki page (tiny change): + http://www.emacswiki.org/PythonProgrammingInEmacs#toc14 + +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * expand.el (expand-pos, expand-index, expand-point): + Remove redundant info from docstring. + (expand-add-abbrevs): Doc fix. + (expand-c-sample-expand-list, expand-sample-lisp-mode-expand-list) + (expand-sample-perl-mode-expand-list): Fix typos. + + * net/dbus.el (dbus-event-member-name): + * play/5x5.el (5x5-solve-rotate-left, 5x5-solver-output): + * term/pc-win.el (msdos-create-frame-with-faces): + * textmodes/texinfmt.el (texinfo-format-image): Fix typos. + +2011-11-16 Martin Rudalics <rudalics@gmx.at> + + * window.el (split-window, window-state-get-1) + (window-state-put-1, window-state-put-2): Rename occurrences of + window-nest to window-combination-limit. + * cus-start.el (window-nest): Rename to + window-combination-limit. + +2011-11-16 Chong Yidong <cyd@gnu.org> + + * progmodes/autoconf.el (autoconf-mode): Fix comment-start-skip + regexp (Bug#10033). + +2011-11-16 Stefan Monnier <monnier@iro.umontreal.ca> + + * tmm.el (tmm-prompt): Use minibuffer-with-setup-hook (bug#10053). + `completing-read' will remove *Completions* and will preserve + current-buffer for us. + (tmm-add-prompt): Users of *Completions* will always (re)set its + major mode. + (tmm-old-comp-map): Remove. + +2011-11-16 Glenn Morris <rgm@gnu.org> + + * mail/rmailedit.el: Require rmailmm when compiling. + (rmail-old-mime-state): New declaration. + (rmail-edit-current-message): If editing a mime message, + edit the "raw" message from the mbox buffer. + (rmail-cease-edit): Handle mime messages. (Bug#9840) + +2011-11-15 Glenn Morris <rgm@gnu.org> + + * mail/rmailmm.el (rmail-mime-toggle-raw): Remove entity arg, + which wasn't being used. Add optional arg to force given state. + (rmail-mime): Add optional arg to force given state. + +2011-11-15 Juanma Barranquero <lekktu@gmail.com> + + * allout.el (allout-encryption-plaintext-sanitization-regexps): + * frame.el (display-mm-dimensions-alist): + * outline.el (outline-mode-menu-bar-map, outline-move-subtree-up) + (outline-move-subtree-down): + * net/newst-treeview.el (newsticker--treeview-do-get-node-of-feed) + (newsticker--treeview-do-get-node): + * net/quickurl.el (quickurl-list-buffer-name): + * progmodes/dcl-mode.el (dcl-mode): + * progmodes/gdb-mi.el (gdb-mapcar*): + * progmodes/sql.el (sql-mode-oracle-font-lock-keywords): Fix typos. + +2011-11-15 Glenn Morris <rgm@gnu.org> + + * mail/rmail.el (rmail-file-coding-system): It's only ever used + in a boolean sense, so just make it a boolean, and fix the doc. + (rmail-show-mime-function, rmail-mime-feature) + (rmail-require-mime-maybe): Doc fixes. + (rmail-show-message-1): Check rmail-show-mime-function is non-nil. + + * mail/rmailmm.el (rmail-show-mime): Doc fix. + +2011-11-15 Juanma Barranquero <lekktu@gmail.com> + + * epg.el (epg-start-decrypt, epg-start-verify, epg-start-sign) + (epg-start-encrypt, epg-start-export-keys, epg-start-import-keys) + (epg-start-receive-keys, epg-start-delete-keys, epg-start-sign-keys) + (epg-start-generate-key, epg-context-set-progress-callback): Fix typos. + +2011-11-15 Glenn Morris <rgm@gnu.org> + + * mail/rmailmm.el (rmail-mime-entity, rmail-mime-entity-segment) + (rmail-mime-shown-mode, rmail-mime-hidden-mode, rmail-mime-raw-mode) + (rmail-mime-toggle-hidden, rmail-mime-insert-tagline) + (rmail-mime-insert-header, rmail-mime-handle, rmail-mime-parse) + (rmail-mime, rmail-show-mime): Doc fixes. + + * term/ns-win.el (mode-line-frame-identification): + Leave it alone. (Bug#10051) + + * simple.el (mark-whole-buffer): Doc fix. (Bug#10023) + + * mail/rmailout.el (rmail-output-to-rmail-buffer): + Handle empty buffers. (Bug#9978) + +2011-11-14 Juanma Barranquero <lekktu@gmail.com> + + * international/mule.el (define-charset): + * mail/rmailmm.el (rmail-mime-find-header-encoding): + * progmodes/prolog.el (prolog-mode-hook, prolog-inferior-mode-hook): + * progmodes/verilog-mode.el (verilog-backward-token): + * textmodes/ispell.el (lookup-words): + * textmodes/sgml-mode.el (sgml-guess-indent): Fix typos. + +2011-11-14 Glenn Morris <rgm@gnu.org> + + * progmodes/executable.el + (executable-make-buffer-file-executable-if-script-p): + Handle file-modes returning nil. + + * mail/rmailsum.el (rmail-summary): Remove movement to beginning of + message - not necessary, and causes problems. (Bug#9831) + + * mail/rmailsum.el (rmail-new-summary): Preserve message number. + + * mail/rmail.el (rmail-no-mail-p): Remove mode-line N/M indicator. + + * mail/rmailsum.el (rmail-summary, rmail-new-summary) + (rmail-new-summary-1): Allow empty summaries. (Bug#9964) + (rmail-new-summary): Remember that rmail-summary-buffer is buffer-local. + +2011-11-12 Martin Rudalics <rudalics@gmx.at> + + * window.el (window-resize, delete-window): Use window-splits + variable instead of function. + (window-state-get-1, window-state-put-2, window-state-put): + Don't deal with windows' splits status. + +2011-11-12 Glenn Morris <rgm@gnu.org> + + * apropos.el (apropos-do-all, apropos-library, apropos-value) + (apropos-documentation): Doc fixes. + +2011-11-11 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/idlw-shell.el (idlwave-shell-make-new-bp-overlay): + * textmodes/sgml-mode.el (html-tag-help): Fix typos. + +2011-11-11 Stefan Monnier <monnier@iro.umontreal.ca> + + * electric.el (electric-indent-post-self-insert-function): Make it + possible for a char to only indent in some circumstances. + (electric-indent-mode): Simplify. + +2011-11-11 Martin Rudalics <rudalics@gmx.at> + + * window.el (windows-with-parameter): Remove unused function. + (windows-at-side): Rename to window-at-side-list. + (window-check, window-atom-check, window-atom-check-1) + (window-side-check, window-size-ignore, window-size-fixed-1) + (window-in-direction-2): Prefix with "window--". + (window-tree-1): Rename to window--subtree, fix doc-string. + +2011-11-11 Glenn Morris <rgm@gnu.org> + + * subr.el (eval-after-load): If FILE is already loaded, + evaluate FORM before it gets wrapped in more stuff. (Bug#10009) + +2011-11-10 Glenn Morris <rgm@gnu.org> + + * vc/vc-svn.el (vc-svn-create-repo, vc-svn-modify-change-comment): + Call svn via vc-svn-command rather than vc-do-command. + (vc-svn-command): Add --non-interactive. (Bug#9993) + (vc-svn-update, vc-svn-merge-news): No need for --non-interactive. + + * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions): + Add toggle-read-only. (Bug#7292) + * files.el (toggle-read-only): Mention that it should only + be used interactively. (Bug#10006) + +2011-11-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Adjust regexp for OCaml warnings. + + * electric.el (electric-pair-post-self-insert-function): Let user + turn it off buffer-locally (bug#9932). + + * progmodes/python.el (python-beginning-of-statement): + Rewrite (bug#2703). + + * progmodes/compile.el: Better handle TABs (bug#9749). + (compilation-internal-error-properties) + (compilation-next-error-function): Obey the target buffer's + compilation-error-screen-columns. + +2011-11-09 Juanma Barranquero <lekktu@gmail.com> + + * progmodes/meta-mode.el: Remove obsolete comments. + (meta-right-comment-regexp, meta-ignore-comment-regexp): + Fix typos in docstrings. + +2011-11-09 Martin Rudalics <rudalics@gmx.at> + + * window.el (window-size-fixed-p): Rewrite doc-string. + (window-resizable-p): Rename to window--resizable-p. Update callers. + (window--resizable): New function. Make all callers of + window-resizable call window--resizable instead. + (window-resizable): Rewrite in terms of window--resizable. + +2011-11-08 Glenn Morris <rgm@gnu.org> + + * progmodes/delphi.el (delphi-mode-syntax-table): + Let define-derived-mode define a proper syntax table. (Bug#9994) + +2011-11-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * window.el: Stay away from defsubst. + (window-list-no-nils): Remove. + (window-state-get-1, window-state-get): Use backquote instead. + +2011-11-08 thierry <thierry.volpiatto@gmail.com> + + * emacs-lisp/find-func.el (find-function-read): + Fix incorrect use of default argument in `completing-read'. + +2011-11-08 Martin Rudalics <rudalics@gmx.at> + + * window.el (display-buffer-function, special-display-function): + Mention display-buffer-record-window but do not mention + help-setup parameter in doc-strings. + (window-min-delta): Fix doc-string typo. + +2011-11-08 Chong Yidong <cyd@gnu.org> + + * window.el (window-total-height, window-total-width): Doc fix. + (window-body-size): Move from C. + (window-body-height, window-body-width): Move to C. + +2011-11-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * window.el: Make special-display like display-buffer-alist (bug#9532). + (display-buffer--special-action): New function, morphed + from display-buffer--special. + (display-buffer): Use it to handle special-display-buffers at higher + priority (just after display-buffer-alist). + (display-buffer-fallback-action, display-buffer--other-frame-action) + (pop-to-buffer-same-window): Remove display-buffer--special. + +2011-11-07 Glenn Morris <rgm@gnu.org> + + * calendar/cal-menu.el (cal-menu-set-date-title): + Do nothing if not in a calendar. (Bug#9976) + +2011-11-07 Stefan Monnier <monnier@iro.umontreal.ca> + + * files.el (find-file): Always use selected-window. + +2011-11-07 Martin Rudalics <rudalics@gmx.at> + + * window.el (window-combinations): Make WINDOW argument + mandatory. Rewrite doc-string. + (walk-window-subtree, window-atom-check, window-min-delta) + (window-max-delta, window--resize-this-window) + (window--resize-root-window-vertically, window-tree) + (balance-windows, window-state-put): Rewrite doc-strings as to + not mention the term "subwindow". + (window--resize-subwindows-skip-p): Rename to + window--resize-child-windows-skip-p. + (window--resize-subwindows-normal): Rename to + window--resize-child-windows-normal. + (window--resize-subwindows): Rename to + window--resize-child-windows. + (window-or-subwindow-p): Rename to window--in-subtree-p. + +2011-11-07 Mark Lillibridge <mark.lillibridge@hp.com> (tiny change) + + * mail/rmail.el (rmail-get-new-mail, rmail-insert-inbox-text): + Ensure that mbox format messages end in two newlines (Bug#9974). + +2011-11-06 Chong Yidong <cyd@gnu.org> + + * window.el (window-combination-p): Function deleted; its + side-effect is not used in any existing code. + (window-combinations, window-combined-p): Call window-*-child + directly. + +2011-11-05 Chong Yidong <cyd@gnu.org> + + * window.el (window-valid-p): Rename from window-any-p. + (window-size-ignore, window-state-get): Callers changed. + (window-normalize-window): Rename from window-normalize-any-window. + New arg LIVE-ONLY, replacing window-normalize-live-window. + (window-normalize-live-window): Delete. + (window-combination-p, window-combined-p, window-combinations) + (walk-window-subtree, window-atom-root, window-min-size) + (window-sizable, window-sizable-p, window-size-fixed-p) + (window-min-delta, window-max-delta, window-resizable) + (window-resizable-p, window-full-height-p, window-full-width-p) + (window-current-scroll-bars, window-point-1, set-window-point-1) + (window-at-side-p, window-in-direction, window-resize) + (adjust-window-trailing-edge, maximize-window, minimize-window) + (window-deletable-p, delete-window, delete-other-windows) + (record-window-buffer, unrecord-window-buffer) + (switch-to-prev-buffer, switch-to-next-buffer, window--delete) + (quit-window, split-window, window-state-put) + (set-window-text-height, fit-window-to-buffer) + (shrink-window-if-larger-than-buffer): Callers changed. + +2011-11-04 Eli Zaretskii <eliz@gnu.org> + + * mail/rmail.el (rmail-simplified-subject): Decode subject with + rfc2047-decode-string. + (rmail-mime-toggle-hidden): Declare to avoid byte-compilation + warnings. + + * window.el (window-body-height, window-body-width): Mention in + the doc string that the return values are in frame's canonical + units. (Bug#9949) + +2011-11-03 Alan Mackenzie <acm@muc.de> + + * progmodes/cc-langs.el (c-nonlabel-token-2-key): New variable for + change in cc-engine.el. + +2011-11-02 Stefan Monnier <monnier@iro.umontreal.ca> + + * window.el (switch-to-buffer): Use `force-same-window' interactively. + +2011-11-02 Martin Rudalics <rudalics@gmx.at> + + * window.el (quit-window): Call unrecord-window-buffer after + showing another buffer in the window. (Bug#9937) + (bury-buffer): Call switch-to-prev-buffer with second argument `bury'. + 2011-11-02 Juanma Barranquero <lekktu@gmail.com> * vc/vc-bzr.el (vc-bzr-state, vc-bzr-after-dir-status): @@ -31,8 +456,8 @@ 2011-10-30 Martin Rudalics <rudalics@gmx.at> * window.el (window-iso-combination-p, window-iso-combined-p) - (window-iso-combinations): Remove "iso-" infix. Suggested by - Chong Yidong. + (window-iso-combinations): Remove "iso-" infix. + Suggested by Chong Yidong. (window-min-size-1, window-size-fixed-1, window-min-delta-1) (window-max-delta-1, window-resize, window--resize-siblings) (window--resize-this-window, adjust-window-trailing-edge) @@ -126,14 +551,12 @@ * progmodes/cc-langs.el (c-defun-tactic): Move this variable to cc-vars.el. - (c-nonlabel-token-2-key): New variable for change in cc-engine.el. * progmodes/cc-engine.el (c-beginning-of-statement-1): Prevent "class foo : bar" being spuriously recognized as a label. * progmodes/cc-cmds.el (c-narrow-to-most-enclosing-decl-block): - Add parameter `inclusive' (to include enclosing braces in the - region). + Add parameter `inclusive' (to include enclosing braces in the region). (c-widen-to-enclosing-decl-scope): New function. (c-while-widening-to-decl-block): New macro. (c-beginning-of-defun, c-end-of-defun): Change algorithm to keep going @@ -154,18 +577,17 @@ * progmodes/cc-defs.el: Update "virtual semicolon" comments. * progmodes/cc-engine.el (c-crosses-statement-barrier-p): - Recoded to scan one line at at time rather than having \n and \r - explicitly in c-stmt-delim-chars - (for some modes, e.g. AWK). + Recode to scan one line at a time rather than having \n and \r + explicitly in c-stmt-delim-chars (for some modes, e.g. AWK). (c-forward-label): Amend for virtual semicolons. - (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions + (c-at-macro-vsemi-p, c-macro-vsemi-status-unknown-p): New functions. * progmodes/cc-fonts.el (c-font-lock-declarations): Take account of the new C macros. * progmodes/cc-langs.el (c-at-vsemi-p-fn): - (c-vsemi-status-unknown-p-fn): move to earlier in the file. - (c-opt-cpp-symbol, c-line-comment-start-regexp): New language variables. + (c-vsemi-status-unknown-p-fn): Move to earlier in the file. + (c-opt-cpp-symbol, c-line-comment-start-regexp): New language vars. (c-opt-cpp-macro-define): Make into a full language variable. (c-stmt-delim-chars, c-stmt-delim-chars-with-comma): Special value for AWK Mode (including \n, \r) removed, no longer needed. @@ -175,7 +597,7 @@ * progmodes/cc-vars.el (c-macro-with-semi-re): (c-macro-names-with-semicolon): New variables. - (c-make-macro-with-semi-re): New function + (c-make-macro-with-semi-re): New function. 2011-10-28 Stefan Monnier <monnier@iro.umontreal.ca> @@ -225,12 +647,12 @@ 2011-10-26 Juanma Barranquero <lekktu@gmail.com> - * term/w32-win.el (w32-default-color-map): Declare obsolete. (Bug#9785) + * term/w32-win.el (w32-default-color-map): Declare obsolete (Bug#9785). 2011-10-26 Michael Albinus <michael.albinus@gmx.de> * ido.el (ido-file-name-all-completions-1): Do not require - tramp.el explicitely. (Bug#7583) + tramp.el explicitly. (Bug#7583) 2011-10-26 Stefan Monnier <monnier@iro.umontreal.ca> @@ -273,7 +695,8 @@ 2011-10-24 Stefan Monnier <monnier@iro.umontreal.ca> - * progmodes/octave-inf.el (inferior-octave-mode-map): Fix C-c C-h binding. + * progmodes/octave-inf.el (inferior-octave-mode-map): + Fix C-c C-h binding. * progmodes/octave-mod.el (octave-help): Remove. 2011-10-23 Michael Albinus <michael.albinus@gmx.de> @@ -2247,13 +2670,13 @@ 2011-08-20 Alan Mackenzie <acm@muc.de> - * Fontify CPP expressions correctly when starting in the middle of + Fontify CPP expressions correctly when starting in the middle of such a construct. Mainly for when jit-lock etc. starts a chunk here. - * progmodes/cc-fonts.el (c-font-lock-context): new buffer local + * progmodes/cc-fonts.el (c-font-lock-context): New buffer local variable. - (c-make-font-lock-search-form): new function, extracted from + (c-make-font-lock-search-form): New function, extracted from c-make-font-lock-search-function. (c-make-font-lock-search-function): Use the above function. (c-make-font-lock-context-search-function): New function. @@ -2584,7 +3007,7 @@ * progmodes/cc-fonts.el (c-font-lock-declarations): Jump over the QT keyword "more" to prevent "more slots: ...." being spuriously - parsed as a bitfield declaraion. + parsed as a bitfield declaration. * progmodes/cc-engine.el (c-beginning-of-statement-1): Refactor and enhance to handle bitfield declarations. @@ -3283,7 +3706,7 @@ Also clean up the code slightly. * progmodes/grep.el (rgrep): Don't bind `process-connection-type', - because that makes the colours go away. + because that makes the colors go away. * mail/sendmail.el (send-mail-function): Change the default to `sendmail-query-once'. @@ -3656,7 +4079,7 @@ for list)" (bug#6475). * files.el (file-expand-wildcards): Ignore non-readable - sub-directories while trying to find matches instead of signalling + sub-directories while trying to find matches instead of signaling an error (bug#6297). * man.el (Man-reference-regexp): Allow matching possible @@ -5329,7 +5752,7 @@ * image-mode.el (image-toggle-display-image): Ensure that the image spec passed to the animate timer is the same object as in - the the buffer's display property (Bug#6981). + the buffer's display property (Bug#6981). (image-transform-properties): Doc fix. * image.el (image-animate-max-time): Default to nil. @@ -5411,7 +5834,7 @@ 2011-05-28 Stefan Monnier <monnier@iro.umontreal.ca> * minibuffer.el (completion--capf-wrapper): Check applicability before - retuning non-nil for non-exclusive completion data. + returning non-nil for non-exclusive completion data. * progmodes/etags.el (tags-completion-at-point-function): * info-look.el (info-lookup-completions-at-point): Mark as non-exclusive. diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1 index f1c931589d1..aac6e998a88 100644 --- a/lisp/ChangeLog.1 +++ b/lisp/ChangeLog.1 @@ -1947,7 +1947,7 @@ elements of command-history are expressions. * simple.el (error): - Just keep signalling if user tries to continue. + Just keep signaling if user tries to continue. 1985-09-07 Richard M. Stallman (rms@mit-prep) diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10 index 1c2f2b5b015..0cf64cf36e9 100644 --- a/lisp/ChangeLog.10 +++ b/lisp/ChangeLog.10 @@ -2339,7 +2339,7 @@ skips encoded regions. Allow user to skip saving Fcc messages with large attachments. Fixed region skipping bug with multi-line comments - e.g. tex $ regions spanning multiple lines. - Added support for postscript and uuencoded regions. + Added support for PostScript and uuencoded regions. Redundant dictionary file names purged. Dictionary definition field name changed from "Character Set" to "Coding System". Fixed bug in reloading dictionaries. @@ -2374,7 +2374,7 @@ (ispell-valid-dictionary-list): New function returning all valid dictionaries on machine. (ispell-checking-message): Documentation string improved. - (ispell-skip-region-alist): Add uuencoded and postscript region + (ispell-skip-region-alist): Add uuencoded and PostScript region skipping. Improve http/e-mail/file regexp to not match `/.\w'. (ispell-html-skip-alists): New variable for html region support. (ispell-send-string): Remove redundant xemacs check. @@ -2402,7 +2402,7 @@ html skipping pushed to alists. (ispell-get-line): Add support for multi-line comment regions. (ispell): Check that variables to continue spelling are bound. - (ispell-message-text-end): Postscript and uuencoded regions now + (ispell-message-text-end): PostScript and uuencoded regions now supported as MIME regions, rather than as end-of-message region. (ispell-mime-multipartp): New function supporting MIME. (ispell-mime-skip-part): New function supporting MIME. @@ -3318,7 +3318,7 @@ ada-prj.el are now defined in this package, which makes it easier to edit menus. (ada-narrow-to-defun): Add support for `narrow-to-region'. - No longer explicitely load ada-xref.el and ada-prj.el. Use autoload + No longer explicitly load ada-xref.el and ada-prj.el. Use autoload statements instead. * progmodes/ada-xref.el (ada-gnatls-args): New variable. @@ -3516,7 +3516,7 @@ 2003-04-23 Stefan Monnier <monnier@cs.yale.edu> * newcomment.el (comment-normalize-vars): Prompt the user for - the comment-start to use rather than signalling an error. Fix regexp. + the comment-start to use rather than signaling an error. Fix regexp. (uncomment-region): Don't leave half-removed comment markers. 2003-04-23 Richard M. Stallman <rms@gnu.org> @@ -4332,7 +4332,7 @@ 2003-04-01 Stefan Monnier <monnier@cs.yale.edu> - * progmodes/asm-mode.el (asm-mode-syntax-table): Setup entries + * progmodes/asm-mode.el (asm-mode-syntax-table): Setup entries that do not depend on asm-comment-char. (asm-mode-map): Declare and init at the same time. (asm-code-level-empty-comment-pattern) @@ -9383,7 +9383,7 @@ 2002-10-06 Glenn Morris <gmorris@ast.cam.ac.uk> - * progmodes/fortran.el (fortran-beginning-do): Ignore labelled DO + * progmodes/fortran.el (fortran-beginning-do): Ignore labeled DO loops. 2002-10-05 Stefan Monnier <monnier@cs.yale.edu> @@ -9632,7 +9632,7 @@ named ucs-translation-table-for-decode vacant. If FOR-ENCODE is non-nil, make a proper char-table populates the translation table name utf-translation-table-for-encode. Call register-char-codings - for all mule-utf-* to to reset their status to the original. + for all mule-utf-* to reset their status to the original. (unify-8859-on-encoding-mode): Call ucs-unify-8859 and ucs-fragment-8859 with fixed arguments. Set the version to 21.3. (unify-8859-on-decoding-mode): Likewise. Remove dependency. @@ -10545,7 +10545,7 @@ 2002-09-22 Kai Großjohann <grossjoh@ls6.informatik.uni-dortmund.de> - * dired.el (dired-insert-directory): Always add "--dired" to to + * dired.el (dired-insert-directory): Always add "--dired" to SWITCHES for remote files. * files.el (insert-directory): Comment saying that "--dired" might be in the SWITCHES. @@ -11617,7 +11617,7 @@ * emacs-lisp/bytecomp.el (byte-compile-warning-prefix): Decide here whether to print which form we're compiling. If we do that, still print file and line. Make file name - relative to default-directory. Print fewer newlines. + relative to default-directory. Print fewer newlines. (byte-compile-log-file): Print something even if no file. Print messages for entering and leaving directories, and set default-directory. @@ -12899,7 +12899,7 @@ * timer.el (timer-inc-time): Doc fix. * replace.el (keep-lines, flush-lines): Interactively report - read-only error before reading regexp argument. + read-only error before reading regexp argument. * dabbrev.el (dabbrev--search): Use inhibit-point-motion-hooks. @@ -21105,12 +21105,12 @@ so that the next undo after an error will not begin redoing. * simple.el (shell-command): Doc fix. - (shell-command-on-region): If there is output an an error, + (shell-command-on-region): If there is output and an error, add "...Shell command failed" to the output. 2001-12-13 David Ponce <david@dponce.com> - * ruler-mode.el (ruler-mode-left-fringe-cols): Variable removed. + * ruler-mode.el (ruler-mode-left-fringe-cols): Variable removed. (ruler-mode-left-fringe-cols): Function replaced by more efficient implementation `ruler-mode-extra-left-cols'. (ruler-mode-ruler): Use above new function. Take into account @@ -23550,4 +23550,3 @@ See ChangeLog.9 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11 index 76bac50c4b8..08bd70926b4 100644 --- a/lisp/ChangeLog.11 +++ b/lisp/ChangeLog.11 @@ -5283,7 +5283,7 @@ (disabled-command-function): Function renamed from `disabled-command-hook'. Adapt code to name change of the variable. -2004-08-07 Satyaki Das <satyaki@theforce.stanford.edu> (tiny change) +2004-08-07 Satyaki Das <satyaki@theforce.stanford.edu> * simple.el (completion-root-regexp): New defvar. (completion-setup-function): Use it instead of a literal string. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 35572bd6105..e916db64f05 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -764,7 +764,7 @@ Fix calls to get-buffer-window to find windows in other frames. Reported by David Hansen <david.hansen@gmx.net>. -2007-03-27 Kevin Ryde <user42@zip.com.au> +2007-03-27 Kevin Ryde <user42@zip.com.au> * info.el (Info-display-images-node): On a text-only terminal, show the "text" or "alt" parts of the image blobs. @@ -938,7 +938,7 @@ 2007-03-20 David Kastrup <dak@gnu.org> * files.el (magic-mode-alist): Require literal "%!PS" string for - magic postscript file detection. + magic PostScript file detection. 2007-03-20 Richard Stallman <rms@gnu.org> @@ -7561,7 +7561,7 @@ * pcvs-util.el (cvs-get-buffer-create): Obey `noreuse' even if `name' doesn't look like a file name. - * complete.el (PC-expand-many-files): Avoid signalling an error when + * complete.el (PC-expand-many-files): Avoid signaling an error when the current directory doesn't exist. Reported by Michaël Cadilhac. 2006-08-02 Andreas Schwab <schwab@suse.de> @@ -8855,7 +8855,7 @@ (org-get-indentation): New optional argument LINE. (org-fix-indentation, org-remove-tabs): New functions. (org-export-as-ascii, org-ascii-level-start): Determine and apply - correct indentation for headlines that are converted it items. + correct indentation for headlines that are converted to items. (org-skip-comments): Remove table lines that contain narrowing cookies but no other non-empty fields. (org-set-tags): Allow groups of mutually exclusive tags. @@ -9419,7 +9419,7 @@ (org-insert-labeled-timestamps-at-point): New option. (org-cycle, org-occur, org-scan-tags): Use `org-overview' instead of `hide-sublevels 1', in case the first headline is not level 1. - (org-overview, org-content): New fuction. + (org-overview, org-content): New function. (org-cycle-global-status, org-cycle-subtree-status): Make these variables buffer-local. (org-global-cycle): New command. @@ -16735,7 +16735,7 @@ * progmodes/cc-cmds.el (c-beginning-of-statement (and subfunctions)): Adapt c-\(back\|forward\)-over-illiterals such that movement over macros and code are rigorously separated from - eachother. Correct a few incidental bugs. + each other. Correct a few incidental bugs. * progmodes/cc-cmds.el: Restructure c-beginning-of-statement: Improve its doc-string. Improve the handling of certain specific cases. @@ -16884,7 +16884,7 @@ * progmodes/cc-fonts.el (c-font-lock-complex-decl-prepare) (c-font-lock-declarators, c-font-lock-declarations) (c-complex-decl-matchers, c-basic-matchers-after): Use a text - property to mark the items in in declarator lists to handle + property to mark the items in declarator lists to handle refontification inside multiline declarations better. * progmodes/cc-fonts.el (c-font-lock-declarations): Recognize a @@ -18374,7 +18374,7 @@ (tar-summarize-buffer): Don't clear the modified-p bit if it wasn't cleared before. Obey default-enable-multibyte-characters. Use mapconcat. Simplify setting of tar-header-offset. - (tar-mode-map): Move initialization inside delcaration. + (tar-mode-map): Move initialization inside declaration. (tar-flag-deleted): Use `abs'. (tar-expunge-internal): Remove unused var `line'. (tar-expunge-internal): Don't hardcode point-min==1. @@ -33362,4 +33362,3 @@ See ChangeLog.11 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13 index 993c51163cb..319cdb14b9b 100644 --- a/lisp/ChangeLog.13 +++ b/lisp/ChangeLog.13 @@ -16,7 +16,7 @@ * international/fontset.el (script-representative-chars): Add cham and tai-viet. (setup-default-fontset): Add iso10646-1 font for latin and ipa. - Add fontconfig spec for cjk-misc. Explicitly specify font font + Add fontconfig spec for cjk-misc. Explicitly specify font for U+E000..U+F8FF. * international/characters.el (script-list): Add cham. @@ -1673,7 +1673,7 @@ x-resolve-font-name. (x-complement-fontset-spec): Never prepend an ASCII font. (create-fontset-from-fontset-spec): If a fontset of the same name - already exists, override it instead of signalling an error. Don't + already exists, override it instead of signaling an error. Don't turn `ascii' into `latin'. Don't update fontset-alias-alist here. * international/mule-conf.el (unicode-bmp): Delete duplicated @@ -10127,7 +10127,7 @@ 2007-10-08 Richard Stallman <rms@gnu.org> * wid-edit.el (widget-specify-button): Don't merge mouse-face with - neighbouring buttons. + neighboring buttons. 2007-10-08 Andreas Schwab <schwab@suse.de> @@ -10151,7 +10151,7 @@ 2007-10-08 Stefan Monnier <monnier@iro.umontreal.ca> * wid-edit.el (widget-image-insert): Don't merge mouse-face with - neighbouring buttons. + neighboring buttons. * progmodes/compile.el (compilation-error-regexp-alist-alist): Recognize gcc's use of "note" for informational messages. @@ -11855,7 +11855,7 @@ (org-agenda-files): Ignore non-existing files. (org-agenda-skip-unavailable-files): New variable. (org-ellipsis): All a face as value. - (org-mode): Interprete the face value of `org-ellipsis'. + (org-mode): Interpret the face value of `org-ellipsis'. (org-archive-save-context-info): New option. (org-archive-subtree): Store context info in archived entry. (org-fast-tag-selection-can-set-todo-state): New variable. @@ -11890,7 +11890,7 @@ (org-set-regexps-and-options): Use `org-remove-keyword-keys'. (org-remove-keyword-keys): New function. -2007-08-30 Jari Aalto <jari.aalto@cante.net> (tiny change) +2007-08-30 Jari Aalto <jari.aalto@cante.net> * progmodes/grep.el (grep-find-ignored-directories): Add monotone _MTN bookkeeping directory in workspaces. @@ -16414,7 +16414,7 @@ 2007-05-16 Stefan Monnier <monnier@iro.umontreal.ca> * files.el (magic-mode-alist, magic-fallback-mode-alist): - Move the *ml, Postscript, and XmCD entries to the fallback part. + Move the *ml, PostScript, and XmCD entries to the fallback part. * files.el (magic-fallback-mode-alist): Rename from file-start-mode-alist. diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14 index c30f0e749ce..cd91dfad28c 100644 --- a/lisp/ChangeLog.14 +++ b/lisp/ChangeLog.14 @@ -2885,11 +2885,11 @@ 2009-01-25 Craig Markwardt <cbmarkwardt@gmail.com> * calendar/icalendar.el (icalendar-uid-format): New defcustom - variable to allow the user to choose icalendar UID format. + variable to allow the user to choose iCalendar UID format. (icalendar--diarytime-to-isotime): Bug fix, now times in the range 12:00am-12:59am are correctly converted to 0000-0059, instead of 12pm. (icalendar-export-region, icalendar--create-uid): Use custom - function to compute icalendar UID for each entry. + function to compute iCalendar UID for each entry. (icalendar--parse-summary-and-rest): Bug fix for parsing of lines with description, location, etc. fields (need to keep active count of fields encountered). Another bug fix to the regex that matches @@ -6724,7 +6724,7 @@ (rx-check-any): Return result as a list. Don't convert chars to strings. Don't prepend "\\" to "^". Don't search for close bracket. Check char category string. Call rx-form instead of rx-to-string. - (rx-any): Rebuid to complete the function. + (rx-any): Rebuild to complete the function. (rx-check-not): Fix char category regexp pattern string. Call rx-form instead of rx-to-string. (rx-not): Call rx-form instead of rx-to-string. Convert "[^]" to @@ -7913,7 +7913,7 @@ ignored while matching, replace the entire filename with completion. * textmodes/flyspell.el (flyspell-check-pre-word-p): Make sure - flyspell-pre-point is valid to avoid signalling an error in + flyspell-pre-point is valid to avoid signaling an error in post-command-hook. 2008-08-26 Johan Bockgård <bojohan@gnu.org> @@ -17799,7 +17799,7 @@ (org-local-logging): New function. (org-columns-open-link): Fix bug with opening link in column view. (org-local-logging): New function. - (org-todo): Make sure that LOGGING properties are honoured. + (org-todo): Make sure that LOGGING properties are honored. (org-todo-keywords): Improve docstring. (org-startup-options): Cleanup startup options. (org-set-regexps-and-options): Process the "!" markers. @@ -20567,4 +20567,3 @@ See ChangeLog.13 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 9cb24baeb1f..ddd8ad7e7ff 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 @@ -2252,7 +2252,7 @@ Use define-derived-mode. * textmodes/reftex-index.el (reftex-index-phrases-mode-map) (reftex-index-mode-map): Rename from reftex-index(-phrases)-map. - Move init into delcaration. + Move init into declaration. (reftex-index-mode, reftex-index-phrases-mode): Use define-derived-mode. * speedbar.el (speedbar-mode-syntax-table): Renaqme from @@ -3058,7 +3058,7 @@ * net/tramp-sh.el (tramp-sh-handle-start-file-process): Protect buffer-modified value. (Bug#7557) -2010-12-13 Jan Moringen <jmoringe@techfak.uni-bielefeld.de> +2010-12-13 Jan Moringen <jmoringe@techfak.uni-bielefeld.de> * log-edit.el (log-edit-changelog-entries): Regexp quote filename. (Bug#7505) @@ -5815,7 +5815,7 @@ querying the password for. * ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers - behaviour, don't bury the ibuffer buffer when visiting other buffers. + behavior, don't bury the ibuffer buffer when visiting other buffers. 2010-10-08 Chong Yidong <cyd@stupidchicken.com> @@ -11215,7 +11215,7 @@ * bindings.el (complete-symbol): Move into minibuffer.el. * minibuffer.el (complete-tag): Move from etags.el. If tags - completion cannot be performed, return nil instead of signalling + completion cannot be performed, return nil instead of signaling an error. (completion-at-point): Make it an alias for complete-symbol. (complete-symbol): Move from bindings.el, and replace with the @@ -12221,7 +12221,7 @@ 2010-03-27 Nick Roberts <nickrob@snap.net.nz> - Restore GDB/MI fuctionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. + Restore GDB/MI functionality removed by 2009-12-29T07:15:34Z!nickrob@snap.net.nz. * progmodes/gdb-mi.el: Restore. * progmodes/gdb-ui.el: Remove. * progmodes/gud.el: Re-accommodate for gdb-mi.el. @@ -12985,7 +12985,7 @@ file has no read permissions for the owner, there might be problems otherwise. Reported by Ole Laursen <olau@iola.dk>. -22010-02-18 Glenn Morris <rgm@gnu.org> +2010-02-18 Glenn Morris <rgm@gnu.org> * emacs-lisp/authors.el (authors-renamed-files-alist): Add entries for INSTALL.CVS. @@ -13311,7 +13311,7 @@ 2010-01-29 Chong Yidong <cyd@stupidchicken.com> - * dirtrack.el (dirtrack): Warn instead of signalling error if the + * dirtrack.el (dirtrack): Warn instead of signaling error if the regexp is incorrect (Bug#5476). 2010-01-29 Michael Albinus <michael.albinus@gmx.de> @@ -13597,7 +13597,7 @@ * textmodes/artist.el (artist-compute-popup-menu-table): Remove duplicated words in doc-strings. -2010-01-15 David Abrahams <dave@boostpro.com> (tiny change) +2010-01-15 David Abrahams <dave@boostpro.com> (tiny change) * net/mairix.el (mairix-widget-send-query): Send -1 instead of nil to mairix-search to suppress threading (Bug#5342). diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index 1edf6d692a0..2d61f464a29 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -196,7 +196,7 @@ (ispell-required-version): Documentation changes. (ispell-skip-sgml): Documentation changes. (ispell-command-loop): `mode-line-format' now shows misspelled word. - (ispell-message-text-end): Can now process postscript version 1. + (ispell-message-text-end): Can now process PostScript version 1. (ispell-message-start-skip): New variable for block skips, set up for pgp and forward blocks. (ispell-message-end-skip): New variable for block skips, set up for @@ -879,7 +879,7 @@ * ada-mode.el (initial comments): Copyright 1995; don't speak about setup; correct history for a file that actually IS in Emacs 19.29; update list of known bugs. - (all functions): Inititialize all local variables explicitely to 'nil'. + (all functions): Initialize all local variables explicitly to 'nil'. (ada-font-lock-keywords): Initialized according to new user option `font-lock-maximum-decoration'. @@ -5507,7 +5507,7 @@ 1994-10-26 Michael Ernst <mernst@research.microsoft.com> - * ispell.el (ispell-message-text-end): Match Postscript 3 like 2. + * ispell.el (ispell-message-text-end): Match PostScript 3 like 2. 1994-10-26 Ed Reingold <reingold@albert.gnu.ai.mit.edu> diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7 index 7ef7fe9dffc..cb606cd0847 100644 --- a/lisp/ChangeLog.7 +++ b/lisp/ChangeLog.7 @@ -1948,7 +1948,7 @@ Add support for loading the files that contain :version when doing `customize-changed-options' so it can know which variables have changed even in files that were not loaded at the time it was called. - * cus-edit.el (customize-changed-options): Remeber all the + * cus-edit.el (customize-changed-options): Remember all the versions and load the corresponding files before we show the customization buffer. Change the sorting to show the groups first in the customization buffer. @@ -4923,10 +4923,10 @@ (fortran-blink-matching-if, fortran-blink-matching-do) (fortran-indent-new-line): Bind case-fold-search. (fortran-end-do, fortran-beginning-do, fortran-end-if) - (fortran-beginning-if): Bind case-fold-search. Allow labelled blocks. + (fortran-beginning-if): Bind case-fold-search. Allow labeled blocks. Use fortran-end-prog-re. (fortran-if-start-re): New variable. - (fortran-calculate-indent): Allow labelled blocks. Simplify the conds. + (fortran-calculate-indent): Allow labeled blocks. Simplify the conds. Make select case indentation work. (fortran-is-in-string-p): Ignore Emacs 18 bug kluge. (fortran-fill): Allow double quotes in check for string. @@ -6526,7 +6526,7 @@ * bibtex.el (bibtex-autokey-get-titles): Non capitalized title words are used for key generation as well. - (bibtex-member-of-regexp): Case is honoured for matches now. + (bibtex-member-of-regexp): Case is honored for matches now. (bibtex-autokey-titleword-ignore): Added entries provide compatibility to former behavior. @@ -6815,9 +6815,9 @@ `reftex-no-include-regexps'. (reftex-no-include-regexps): New option. (reftex-do-parse): Initialize appendix flag. - (reftex-parse-from-file): Interprete appendix. + (reftex-parse-from-file): Interpret appendix. (reftex-section-info): Use changed version of reftex-section-number. - (reftex-where-am-I): Interprete appendix match. + (reftex-where-am-I): Interpret appendix match. (reftex-init-section-numbers): New arg: appendix. (reftex-section-number): Treat appendix enumeration. (reftex-toc-external): Improved message. @@ -11240,7 +11240,7 @@ (reftex-cite-comment-format): New variable. (reftex-cite-punctuation): New variable. (reftex-make-master-buffer): Changed name of master buffer, - removed interactive. Runs a hook on the buffer. Interprete + removed interactive. Runs a hook on the buffer. Interpret TEXINPUTS environment variable. Allow naked argument for \input. Master buffer is now in fundamental mode. (reftex-access-scan-info): Name of master buffer changed. @@ -11264,9 +11264,9 @@ (reftex-allow-for-ctrl-m): New function. (reftex-label-info-update): Allow more general label commands. (reftex-label-info): New parameter derive. - (reftex-short-context): Interprete integer parse as nth arg of macro. + (reftex-short-context): Interpret integer parse as nth arg of macro. (reftex-nth-parens-substring): New function. - (reftex-select-item): Interprete the new 'cnt text property. + (reftex-select-item): Interpret the new 'cnt text property. (reftex-pop-to-label): Allow more general label commands. (reftex-nicify-text): Allow more general label commands. (reftex-toc): Remember previous window configuration. Use text @@ -21766,9 +21766,9 @@ * f90.el (f90-no-block-limit): Fixed bug for indentation of elsewhere and elseif. - (f90-looking-at-where-or-forall): Now allows for labelled forall + (f90-looking-at-where-or-forall): Now allows for labeled forall and where statements. - (f90-font-lock-keywords-2): New highlighting for labelled where + (f90-font-lock-keywords-2): New highlighting for labeled where and forall. Fixed small bug with else highlighting. (f90-fill-region): Moved indentation to f90-break-line. (f90-break-line): Will now always indent the second line. @@ -22110,7 +22110,7 @@ 1996-09-27 Jacques Duthen <duthen@cegelec-red.fr> * ps-print.el - (ps-print-prologue-1): Fix bug in postscript comment lines. + (ps-print-prologue-1): Fix bug in PostScript comment lines. (ps-nb-pages): Call ps-setup _before_ switching to the other buffer, because of buffer variables. @@ -22123,7 +22123,7 @@ (ps-page-height-i, ps-page-width-i): Variables deleted. (ps-print-prologue): Variable deleted. (ps-print-prologue-1, ps-print-prologue-2): New variables. - Major rewrite of the postscript code to handle landscape mode, + Major rewrite of the PostScript code to handle landscape mode, multiple columns and new font management. (ps-landscape-mode, ps-number-of-columns, ps-inter-column): New variables. @@ -22136,7 +22136,7 @@ (ps-header-font, ps-landscape-page-height): New internal variables. (ps-top-margin): Change its semantics. It is now really the top margin, not anymore twice the top margin. - (/ReportAllFontInfo): New postscript function to get all the font + (/ReportAllFontInfo): New PostScript function to get all the font families of the printer. (ps-setup): New function. (ps-line-lengths, ps-nb-pages-buffer, ps-nb-pages-region): New @@ -23123,4 +23123,3 @@ See ChangeLog.6 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8 index ada6d98ce3d..6d3d41a5a5c 100644 --- a/lisp/ChangeLog.8 +++ b/lisp/ChangeLog.8 @@ -434,7 +434,7 @@ for Emacs 20.4 and the earlier versions. (ps-mule-init-external-library): Just require a feature for external libraries. - (ps-mule-prologue): Postscript code modified for new composition. + (ps-mule-prologue): PostScript code modified for new composition. (ps-mule-find-wrappoint): New arg COMPOSITION. (ps-mule-plot-string): Delete code for composite characters. (ps-mule-plot-composition): New function. @@ -447,7 +447,7 @@ (ps-mule-plot-rule-cmpchar, ps-mule-plot-cmpchar, ps-mule-prepare-cmpchar-font): Deleted. (ps-mule-string-encoding): New arg NO-SETFONT. - (ps-mule-bitmap-prologue): In Postscript code of BuildGlyphCommon, + (ps-mule-bitmap-prologue): In PostScript code of BuildGlyphCommon, check Composing, not Cmpchar. (ps-mule-initialize): Set ps-mule-composition-prologue-generated to nil. @@ -3475,8 +3475,8 @@ (reftex-process-string): Preserve default directory. (reftex-label-alist-builtin): Changed prefixes of endnote and footnote. Also the magic words. - (reftex-reference): Interprete new option `reftex-fref-is-default'. - (reftex-replace-prefix-escapes): Interprete new `%S' format. + (reftex-reference): Interpret new option `reftex-fref-is-default'. + (reftex-replace-prefix-escapes): Interpret new `%S' format. (reftex-toc-mouse-view-line): Command removed (had no binding). (reftex-everything-regexp): New function. (reftex-nearest-match): Made better. @@ -8317,7 +8317,7 @@ 1998-11-11 Sam Steingold <sds@goems.com> * inf-lisp.el (switch-to-lisp): If no inferior lisp present, call - `run-lisp' instead of signalling an error. + `run-lisp' instead of signaling an error. 1998-11-11 Karl Heuer <kwzh@gnu.org> @@ -9750,11 +9750,11 @@ * international/mule.el (charset-description): Doc fix. * language/chinese.el, language/cyrillic.el, language/czech.el, - language/devanagari.el, language/ethiopic.el, - language/european.el, language/hebrew.el, language/indian.el, - language/japanese.el, language/korean.el, language/lao.el, - language/slovak.el, language/thai.el, language/tibetan.el, - language/vietnamese.el: + * language/devanagari.el, language/ethiopic.el, + * language/european.el, language/hebrew.el, language/indian.el, + * language/japanese.el, language/korean.el, language/lao.el, + * language/slovak.el, language/thai.el, language/tibetan.el, + * language/vietnamese.el: Add coding: local variable, to avoid bootstrapping problem if you need to recompile all the Lisp files using interpreted code. @@ -10009,4 +10009,3 @@ See ChangeLog.7 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9 index 14214ccc3d3..4f867c24561 100644 --- a/lisp/ChangeLog.9 +++ b/lisp/ChangeLog.9 @@ -135,7 +135,7 @@ * net/ange-ftp.el (ange-ftp-raw-send-cmd, ange-ftp-wait-not-busy): Use with-current-buffer. - (ange-ftp-cd): New arg `noerror' to prevent signalling an error. + (ange-ftp-cd): New arg `noerror' to prevent signaling an error. (ange-ftp-send-cmd): If a `cd' is used (because of a space in the filename), catch any error that occurs in `ange-ftp-cd'. If an error happened, don't bother sending `cmd' at all. @@ -1754,7 +1754,7 @@ number, column number and buffer-percent part of the mode-line. * image.el (image-type-regexps): Allow whitespace at the start - of the image data for XPM, XBM and Postscript, which are + of the image data for XPM, XBM and PostScript, which are text files. (image-jpeg-p): Correct calculation of next field offset. @@ -2030,7 +2030,7 @@ Do not bind locally the uniquify-possibly-resolvable flag. Use the cached proposed name is possible. (uniquify-get-proposed-name): Arguments changed, callers changed. - (uniquify-rationalize-conflicting-sublist): Explicitely reset the + (uniquify-rationalize-conflicting-sublist): Explicitly reset the uniquify-possibly-resolvable flag, which is no more bound locally. (uniquify-rename-buffer): Do not set the old unrationalised-buffer flag, which does not exist any more. @@ -2628,7 +2628,7 @@ 2001-07-06 Vinicius Jose Latorre <vinicius@cpqd.com.br> - * ps-print.el: Use locale dependant date to print date in header. + * ps-print.el: Use locale dependent date to print date in header. Doc fix. (ps-print-version): New version number (6.5.3). (ps-right-header, ps-right-footer): Initialization and doc fix. @@ -5955,7 +5955,7 @@ 2001-01-29 Gerd Moellmann <gerd@gnu.org> * menu-bar.el (menu-bar-files-menu): Add menu items for - Postscript printing in black and white. + PostScript printing in black and white. * mail/rmail.el (rmail-ignored-headers): Add X-Sign, X-BeenThere, X-Mailman-Version, Precedence, List-Help, List-Post, @@ -10569,7 +10569,7 @@ 2000-10-10 Dave Love <fx@gnu.org> * toolbar/tool-bar.el (tool-bar-add-item) - (tool-bar-add-item-from-menu): Don't favour XPM icons on mono display. + (tool-bar-add-item-from-menu): Don't favor XPM icons on mono display. * toolbar/attach.pbm, toolbar/cancel.pbm, toolbar/close.pbm: * toolbar/copy.pbm, toolbar/cut.pbm, toolbar/exit.pbm: @@ -12638,7 +12638,7 @@ (vc-rcs-diff): Only pass `2' to vc-do-command if necessary and just do a recursive call if we need to retry. (vc-rcs-checkout): Handle the case where rcs is missing by making - the buffer read-write if requested and re-signalling the error. + the buffer read-write if requested and re-signaling the error. * vc-cvs.el (vc-cvs-diff): Remove unused and unsupported argument CMP. @@ -14191,7 +14191,7 @@ * international/ja-dic-cnv.el: Renamed from skkdic-cnv.el. Provide ja-dic-cnv instead of skkdic-cnv. - (ja-dic-filename): Renamed from skkdic-filename. Referers changed. + (ja-dic-filename): Renamed from skkdic-filename. Referrers changed. (iso-2022-7bit-short): Add safe-charsets property. (skkdic-convert-postfix): Search Japanese chou-on character in addition to Hiragana character. @@ -17396,7 +17396,7 @@ 2000-05-25 Kenichi Handa <handa@etl.go.jp> - * international/mule-conf.el: Specify CHARSET-ID explicitely for + * international/mule-conf.el: Specify CHARSET-ID explicitly for private charsets. (mule-unicode-0100-24ff, japanese-jisx0213-1, japanese-jisx0213-2): New charsets. @@ -20709,4 +20709,3 @@ See ChangeLog.8 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/allout-widgets.el b/lisp/allout-widgets.el index 162da1f4815..3c2871594fc 100644 --- a/lisp/allout-widgets.el +++ b/lisp/allout-widgets.el @@ -1,14 +1,13 @@ ;; allout-widgets.el --- Visually highlight allout outline structure. -;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Ken Manheimer +;; Copyright (C) 2005-2011 Free Software Foundation, Inc. -;; Author: Ken Manheimer <ken dot manheimer at gmail dot com> -;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com> +;; Author: Ken Manheimer <ken dot manheimer at gmail...> +;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...> ;; Version: 1.0 ;; Created: Dec 2005 -;; Version: 1.0 ;; Keywords: outlines -;; Website: http://myriadicity.net/Sundry/EmacsAllout +;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout ;;; Commentary: @@ -50,7 +49,7 @@ ;; systematically couple overlays, graphics, and other features with ;; allout-governed text. -;;;_: Code (structured with comments that delinieate an allout outline) +;;;_: Code (structured with comments that delineate an allout outline) ;;;_ : General Environment (require 'allout) @@ -811,7 +810,7 @@ Optional RECURSING is for internal use, to limit recursion." (forward-char -1))))))) (error - ;; zero work list so we don't get stuck futily retrying. + ;; zero work list so we don't get stuck futilely retrying. ;; error recording done by allout-widgets-hook-error-handler. (setq allout-widgets-changes-record nil)))) ;;;_ , major change handlers: @@ -1245,7 +1244,7 @@ Optional FROM-DEPTH is for internal use." (defun allout-range-overlaps (from to ranges) "Return a pair indicating overlap of FROM and TO subtree range in RANGES. -First element of result indicates whether candadate range FROM, TO +First element of result indicates whether candidate range FROM, TO overlapped any of the existing ranges. Second element of result is a new version of RANGES incorporating the @@ -1465,7 +1464,7 @@ recursive operation." :from nil ; item beginning - marker :to nil ; item end - marker - :span-overlay nil ; overlay by which actual postion is determined + :span-overlay nil ; overlay by which actual position is determined ;; also serves as guide-end: :icon-start nil @@ -1632,7 +1631,7 @@ We return the item-widget corresponding to the item at point." (defun allout-redecorate-item (item-widget) "Resituate ITEM-WIDGET decorations, disregarding context. -Use this to redecorate only the item, when you know that it's +Use this to redecorate only the item, when you know that its situation with respect to siblings, parent, and offspring is unchanged from its last decoration. Use `allout-decorate-item-and-context' instead to reassess and adjust diff --git a/lisp/allout.el b/lisp/allout.el index 18cc3c80dc6..8cbdbee7303 100644 --- a/lisp/allout.el +++ b/lisp/allout.el @@ -2,12 +2,12 @@ ;; Copyright (C) 1992-1994, 2001-2011 Free Software Foundation, Inc. -;; Author: Ken Manheimer <ken dot manheimer at gmail dot com> -;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com> +;; Author: Ken Manheimer <ken dot manheimer at gmail...> +;; Maintainer: Ken Manheimer <ken dot manheimer at gmail...> ;; Created: Dec 1991 -- first release to usenet ;; Version: 2.3 ;; Keywords: outlines, wp, languages, PGP, GnuPG -;; Website: http://myriadicity.net/Sundry/EmacsAllout +;; Website: http://myriadicity.net/software-and-systems/craft/emacs-allout ;; This file is part of GNU Emacs. @@ -1537,14 +1537,14 @@ Entries must be symbols that are bound to the desired values. Each value can be a regexp or a list with a regexp followed by a substitution string. If it's just a regexp, all its matches are removed before the text is encrypted. If it's a regexp and a substitution, the -substition is used against the regexp matches, a la `replace-match'.") +substitution is used against the regexp matches, a la `replace-match'.") (make-variable-buffer-local 'allout-encryption-text-removal-regexps) ;;;_ = allout-encryption-ciphertext-rejection-regexps (defvar allout-encryption-ciphertext-rejection-regexps nil "Variable for regexps matching plaintext to remove before encryption. This is used to detect strings in encryption results that would -register as allout mode structural elements, for exmple, as a +register as allout mode structural elements, for example, as a topic prefix. Entries must be symbols that are bound to the desired regexp values. @@ -2525,7 +2525,7 @@ Outermost is first." (defun allout-mark-active-p () "True if the mark is currently or always active." ;; `(cond (boundp...))' (or `(if ...)') invokes special byte-compiler - ;; provisions, at least in fsf emacs to prevent warnings about lack of, + ;; provisions, at least in GNU Emacs to prevent warnings about lack of, ;; eg, region-active-p. (cond ((boundp 'mark-active) mark-active) @@ -3543,7 +3543,7 @@ PRIOR-BULLET.) Fifth arg, NUMBER-CONTROL, matters only if `allout-numbered-bullet' is non-nil *and* no specific INSTEAD was specified. Then NUMBER-CONTROL non-nil forces prefix to either numbered or -denumbered format, depending on the value of the sixth arg, INDEX. +unnumbered format, depending on the value of the sixth arg, INDEX. \(Note that NUMBER-CONTROL does *not* apply to level 1 topics. Sorry...) @@ -3557,7 +3557,7 @@ number is used as the index for the numbered prefix (allowing, eg, sequential renumbering to not require this function counting back the index for each successive sibling)." ;;;_ . Code: - ;; The options are ordered in likely frequence of use, most common + ;; The options are ordered in likely frequency of use, most common ;; highest, least lowest. Ie, more likely to be doing prefix ;; adjustments than soliciting, and yet more than numbering. ;; Current prefix is least dominant, but most likely to be commonly @@ -3807,7 +3807,7 @@ Nuances: ;;(if doing-beginning (goto-char doing-beginning)) (if (not (bobp)) ;; We insert a newline char rather than using open-line to - ;; avoid rear-stickiness inheritence of read-only property. + ;; avoid rear-stickiness inheritance of read-only property. (progn (if (and (not (> depth ref-depth)) (not before)) (open-line 1) @@ -3822,7 +3822,7 @@ Nuances: (if (and (not (eobp)) (or (not (bolp)) (and (not (bobp)) - ;; bolp doesnt detect concealed + ;; bolp doesn't detect concealed ;; trailing newlines, compensate: (save-excursion (forward-char -1) @@ -5473,7 +5473,7 @@ header and body. The elements of that list are: "invalid format" format)))) (list depth prefix strings)) result)) - ;; Reasses format, if any: + ;; Reassess format, if any: (if (and format (listp format)) (cond ((= new-depth depth) (setq format (cons (1+ (car format)) diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el index ff7edf40dcb..4d6f02a40b7 100644 --- a/lisp/ansi-color.el +++ b/lisp/ansi-color.el @@ -68,7 +68,7 @@ ;; ;; Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> for pointing me to ECMA-48. ;; -;; Stefan Monnier <foo@acm.com> explaing obscure font-lock stuff and +;; Stefan Monnier <foo@acm.com> for explaining obscure font-lock stuff and for ;; code suggestions. diff --git a/lisp/apropos.el b/lisp/apropos.el index d3d66f2a070..9a372f27991 100644 --- a/lisp/apropos.el +++ b/lisp/apropos.el @@ -66,9 +66,22 @@ ;; I see a degradation of maybe 10-20% only. (defcustom apropos-do-all nil - "Whether the apropos commands should do more. - -Slows them down more or less. Set this non-nil if you have a fast machine." + "Non nil means apropos commands will search more extensively. +This may be slower. This option affects the following commands: + +`apropos-variable' will search all variables, not just user variables. +`apropos-command' will also search non-interactive functions. +`apropos' will search all symbols, not just functions, variables, faces, +and those with property lists. +`apropos-value' will also search in property lists and functions. +`apropos-documentation' will search all documentation strings, not just +those in the etc/DOC documentation file. + +This option only controls the default behavior. Each of the above +commands also has an optional argument to request a more extensive search. + +Additionally, this option makes the function `apropos-library' +include key-binding information in its output." :group 'apropos :type 'boolean) @@ -582,7 +595,8 @@ Returns list of symbols and documentation found." (defun apropos-library (file) "List the variables and functions defined by library FILE. FILE should be one of the libraries currently loaded and should -thus be found in `load-history'." +thus be found in `load-history'. If `apropos-do-all' is non-nil, +the output includes key-bindings of commands." (interactive (let* ((libs (delq nil (mapcar 'car load-history))) (libs @@ -693,7 +707,9 @@ search for matches for that word as a substring. If it is a list of words, search for matches for any two (or more) of those words. With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also looks -at the function and at the names and values of properties. +at function definitions (arguments, documentation and body) and at the +names and values of properties. + Returns list of symbols and values found." (interactive (list (apropos-read-pattern "value") current-prefix-arg)) @@ -738,10 +754,14 @@ or a regexp (using some regexp special characters). If it is a word, search for matches for that word as a substring. If it is a list of words, search for matches for any two (or more) of those words. -With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also use -documentation that is not stored in the documentation file and show key -bindings. +Note that by default this command only searches in the file specified by +`internal-doc-file-name'; i.e., the etc/DOC file. With \\[universal-argument] prefix, +or if `apropos-do-all' is non-nil, it searches all currently defined +documentation strings. + Returns list of symbols and documentation found." + ;; The doc used to say that DO-ALL includes key-bindings info in the + ;; output, but I cannot see that that is true. (interactive (list (apropos-read-pattern "documentation") current-prefix-arg)) (apropos-parse-pattern pattern) @@ -1032,7 +1052,7 @@ If non-nil TEXT is a string that will be printed as a heading." ;; omitting any that contain a buffer or a frame. ;; FIXME: Why omit keys that contain buffers and ;; frames? This looks like a bad workaround rather - ;; than a proper fix. Does anybod know what problem + ;; than a proper fix. Does anybody know what problem ;; this is trying to address? --Stef (dolist (key keys) (let ((i 0) diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el index e3d1955ded5..48b4c5be164 100644 --- a/lisp/arc-mode.el +++ b/lisp/arc-mode.el @@ -4,7 +4,7 @@ ;; Author: Morten Welinder <terra@gnu.org> ;; Keywords: files archives msdog editing major-mode -;; Favourite-brand-of-beer: None, I hate beer. +;; Favorite-brand-of-beer: None, I hate beer. ;; This file is part of GNU Emacs. @@ -75,7 +75,7 @@ ;; ;; LZH A series of (header,file). Headers are checksummed. No ;; interaction among members. -;; Headers come in three flavours called level 0, 1 and 2 headers. +;; Headers come in three flavors called level 0, 1 and 2 headers. ;; Level 2 header is free of DOS specific restrictions and most ;; prevalently used. Also level 1 and 2 headers consist of base ;; and extension headers. For more details see @@ -1036,7 +1036,7 @@ using `make-temp-file', and the generated name is returned." (setq archive-file-name-coding-system file-name-coding) (if (and (null - (let (;; We may have to encode file name arguement for + (let (;; We may have to encode the file name argument for ;; external programs. (coding-system-for-write (and enable-multibyte-characters diff --git a/lisp/bs.el b/lisp/bs.el index 0c32c8b4f19..2a31b05a31f 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -25,7 +25,7 @@ ;; Version: 1.17 ;; X-URL: http://www.geekware.de/software/emacs ;; -;; The bs-package contains a main function bs-show for poping up a +;; The bs-package contains a main function bs-show for popping up a ;; buffer in a way similar to `list-buffers' and `electric-buffer-list': ;; The new buffer offers a Buffer Selection Menu for manipulating ;; the buffer list and buffers. diff --git a/lisp/button.el b/lisp/button.el index 6ef79532ae7..262a19c1806 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -42,7 +42,7 @@ ;; button face may not be visible. Using overlays avoids this. ;; ;; Using `define-button-type' to define default properties for buttons -;; is not necessary, but it is is encouraged, since doing so makes the +;; is not necessary, but it is encouraged, since doing so makes the ;; resulting code clearer and more efficient. ;; diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index f011d187a42..f1f79252857 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -125,7 +125,7 @@ "The mode settings for Calc buffer when put in embedded mode.") (defun calc-embedded-save-original-modes () - "Save the current Calc modes when entereding embedded mode." + "Save the current Calc modes when entering embedded mode." (let ((calcbuf (save-excursion (calc-create-buffer) (current-buffer))) @@ -144,7 +144,7 @@ (let ((var (cdr (car v)))) (unless (memq var '(the-language the-display-just)) (setq modes - (cons (cons var (symbol-value var)) + (cons (cons var (symbol-value var)) modes)))) (setq v (cdr v)))) (setq calc-embedded-original-modes (cons lang modes))) @@ -182,7 +182,7 @@ (calc-set-mode-line)))) (setq calc-embedded-original-modes nil))) -;; The variables calc-embed-outer-top, calc-embed-outer-bot, +;; The variables calc-embed-outer-top, calc-embed-outer-bot, ;; calc-embed-top and calc-embed-bot are ;; local to calc-do-embedded, calc-embedded-mark-formula, ;; calc-embedded-duplicate, calc-embedded-new-formula and @@ -195,7 +195,7 @@ ;; The variable calc-embed-arg is local to calc-do-embedded, ;; calc-embedded-update-formula, calc-embedded-edit and -;; calc-do-embedded-activate, but is used by +;; calc-do-embedded-activate, but is used by ;; calc-embedded-make-info, which is called by the above ;; functions. (defvar calc-embed-arg) @@ -208,14 +208,14 @@ ;; The following is to take care of any minor modes which override ;; a Calc command. -(defvar calc-override-minor-modes-map +(defvar calc-override-minor-modes-map (make-sparse-keymap) "A list of keybindings that might be overwritten by minor modes.") ;; Add any keys that might be overwritten here. (define-key calc-override-minor-modes-map "`" 'calc-edit) -(defvar calc-override-minor-modes +(defvar calc-override-minor-modes (cons t calc-override-minor-modes-map)) (defun calc-do-embedded (calc-embed-arg end obeg oend) @@ -279,7 +279,7 @@ (calc-embedded-save-original-modes) (or calc-embedded-globals (calc-find-globals)) - (setq info + (setq info (calc-embedded-make-info (point) nil t calc-embed-arg end obeg oend)) (if (eq (car-safe (aref info 8)) 'error) (progn @@ -564,7 +564,7 @@ The command \\[yank] can retrieve it from there." (goto-char calc-embed-outer-bot) (insert "\n") (setq new-top (point)) - (insert-buffer-substring (current-buffer) + (insert-buffer-substring (current-buffer) calc-embed-outer-top calc-embed-outer-bot) (goto-char (+ new-top (- calc-embed-top calc-embed-outer-top))) (let ((calc-embedded-quiet (if already t 'x))) @@ -659,7 +659,7 @@ The command \\[yank] can retrieve it from there." (equal (symbol-value (car (car v))) value)) (progn (setq changed t) - (if temp (setq calc-embed-prev-modes + (if temp (setq calc-embed-prev-modes (cons (cons (car (car v)) (symbol-value (car (car v)))) calc-embed-prev-modes))) @@ -809,12 +809,12 @@ The command \\[yank] can retrieve it from there." (list modes emodes pmodes))) ;; The variable calc-embed-vars-used is local to calc-embedded-make-info, -;; calc-embedded-evaluate-expr and calc-embedded-update, but is +;; calc-embedded-evaluate-expr and calc-embedded-update, but is ;; used by calc-embedded-find-vars, which is called by the above functions. (defvar calc-embed-vars-used) (defun calc-embedded-make-info (point cbuf fresh &optional - calc-embed-top calc-embed-bot + calc-embed-top calc-embed-bot calc-embed-outer-top calc-embed-outer-bot) (let* ((bufentry (assq (current-buffer) calc-embedded-active)) (found bufentry) @@ -831,7 +831,7 @@ The command \\[yank] can retrieve it from there." (newform (assoc major-mode calc-embedded-open-close-formula-alist)) (newword (assoc major-mode calc-embedded-word-regexp-alist)) (newplain (assoc major-mode calc-embedded-open-close-plain-alist)) - (newnewform + (newnewform (assoc major-mode calc-embedded-open-close-new-formula-alist)) (newmode (assoc major-mode calc-embedded-open-close-mode-alist))) (when newann @@ -874,9 +874,9 @@ The command \\[yank] can retrieve it from there." (aset info 1 (or cbuf (save-excursion (calc-create-buffer) (current-buffer))))) - (if (and + (if (and (or (integerp calc-embed-top) (equal calc-embed-top '(4))) - (not calc-embed-bot)) + (not calc-embed-bot)) ; started with a user-supplied argument (progn (if (equal calc-embed-top '(4)) @@ -1157,7 +1157,7 @@ The command \\[yank] can retrieve it from there." (if need-display (calc-embedded-set-justify (cdr (car calc-embed-prev-modes))))) (t - (set (car (car calc-embed-prev-modes)) + (set (car (car calc-embed-prev-modes)) (cdr (car calc-embed-prev-modes))))) (setq calc-embed-prev-modes (cdr calc-embed-prev-modes)))))) diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el index 8b816665d97..5429509af86 100644 --- a/lisp/calc/calc-ext.el +++ b/lisp/calc/calc-ext.el @@ -432,7 +432,7 @@ (define-key calc-mode-map "ls" 'calc-spn) (define-key calc-mode-map "lm" 'calc-midi) (define-key calc-mode-map "lf" 'calc-freq) - + (define-key calc-mode-map "l?" 'calc-l-prefix-help) (define-key calc-mode-map "m" nil) @@ -2867,7 +2867,7 @@ If X is not an error form, return 1." (memq (nth 2 expr) '(var-inf var-uinf var-nan))))) ;; The variable math-integral-cache is originally declared in calcalg2.el, -;; but is set by math-defintegral and math-definitegral2. +;; but is set by math-defintegral and math-defintegral-2. (defvar math-integral-cache) (defmacro math-defintegral (funcs &rest code) diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el index 427cf6ba233..66e9c002a47 100644 --- a/lisp/calc/calc-help.el +++ b/lisp/calc/calc-help.el @@ -683,7 +683,7 @@ C-w Describe how there is no warranty for Calc." (calc-do-prefix-help '("Pack, Unpack, Identity, Diagonal, indeX, Build" "Row, Column, Subvector; Length; Find; Mask, Expand" - "Tranpose, Arrange, reVerse; Head, Kons; rNorm" + "Transpose, Arrange, reVerse; Head, Kons; rNorm" "SHIFT + Det, & (inverse), LUD, Trace, conJtrn, Cross" "SHIFT + Sort, Grade, Histogram; cNorm" "SHIFT + Apply, Map, Reduce, accUm, Inner-, Outer-prod" diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index db86c08422e..6d034927ae0 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -260,13 +260,13 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C). (length msg)) 32) " [?=MORE]") "")))))))) - + ;;;; Stack and buffer management. -;; The variable calc-last-why-command is set in calc-do-handly-whys +;; The variable calc-last-why-command is set in calc-do-handle-whys ;; and used in calc-why (in calc-stuff.el). (defvar calc-last-why-command) diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index 43cb5828e85..86e8cbbc73a 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -1598,7 +1598,7 @@ In symbolic mode, return the list (^ a b)." (or (math-lessp acoeff bcoeff) (math-equal acoeff bcoeff))) (calc-record-why "*Improper coefficients" nil) - (math-mul + (math-mul (if (equal aunit '(var dB var-dB)) (let ((coef (if power 10 20))) (math-mul coef @@ -1681,7 +1681,7 @@ In symbolic mode, return the list (^ a b)." (math-simplify (math-mul (math-add - coef + coef (math-mul (if power 10 20) (math-conditional-apply 'calcFunc-log10 number))) units))) @@ -1689,7 +1689,7 @@ In symbolic mode, return the list (^ a b)." (math-simplify (math-mul (math-add - coef + coef (math-div (math-conditional-apply 'calcFunc-ln number) (if power 2 1))) units)))) (calc-record-why "*Improper units" nil)))) @@ -1707,7 +1707,7 @@ In symbolic mode, return the list (^ a b)." (math-simplify (math-mul (math-sub - coef + coef (math-mul (if power 10 20) (math-conditional-apply 'calcFunc-log10 b))) units))) @@ -1715,7 +1715,7 @@ In symbolic mode, return the list (^ a b)." (math-simplify (math-mul (math-sub - coef + coef (math-div (math-conditional-apply 'calcFunc-ln b) (if power 2 1))) units))))))))) @@ -1762,17 +1762,17 @@ In symbolic mode, return the list (^ a b)." (coeff (math-simplify (math-div val units)))) (math-mul (if (equal lunit '(var dB var-dB)) - (math-mul + (math-mul ref - (math-conditional-pow + (math-conditional-pow 10 (math-div coeff (if power 10 20)))) - (math-mul + (math-mul ref (math-conditional-apply 'calcFunc-exp - (if power + (if power (math-mul 2 coeff) coeff)))) runits))))) @@ -1869,7 +1869,7 @@ In symbolic mode, return the list (^ a b)." (let* ((n (math-round num)) (diff (math-abs (math-sub num n)))) - (if (< (math-compare diff + (if (< (math-compare diff (math-div (math-read-expr calc-note-threshold) 100)) 0) n num))) @@ -1927,10 +1927,10 @@ If non-nil, return a list consisting of the note and the cents coefficient." (assoc (nth 1 note) math-notes) (integerp (nth 2 note)) (setq rnote note) - (or + (or (not cents) (Math-numberp (setq rcents - (math-simplify + (math-simplify (math-div cents '(var cents var-cents))))))) (list rnote rcents)) ((and ;; CENTS is a note, NOTE is cents. @@ -1938,10 +1938,10 @@ If non-nil, return a list consisting of the note and the cents coefficient." (assoc (nth 1 cents) math-notes) (integerp (nth 2 cents)) (setq rnote cents) - (or + (or (not note) (Math-numberp (setq rcents - (math-simplify + (math-simplify (math-div note '(var cents var-cents))))))) (list rnote rcents))))) @@ -1972,7 +1972,7 @@ If non-nil, return a list consisting of the note and the cents coefficient." "Return the scientific pitch notation corresponding to midi number MIDI." (let (midin cents) (if (math-integerp midi) - (setq midin midi + (setq midin midi cents nil) (setq midin (math-floor midi) cents (math-mul 100 (math-sub midi midin)))) @@ -1989,7 +1989,7 @@ If non-nil, return a list consisting of the note and the cents coefficient." (n (math-sub (car nr) 1)) (note (car (rassoc (cdr nr) math-notes)))) (if cents - (list '+ (list 'calcFunc-subscr note n) + (list '+ (list 'calcFunc-subscr note n) (list '* cents '(var cents var-cents))) (list 'calcFunc-subscr note n))))) @@ -2005,7 +2005,7 @@ If non-nil, return a list consisting of the note and the cents coefficient." 440 (math-pow 2 - (math-div + (math-div (math-sub midi 69) @@ -2018,7 +2018,7 @@ If non-nil, return a list consisting of the note and the cents coefficient." (defun calcFunc-spn (expr) "Return EXPR written as scientific pitch notation + cents." - ;; Get the coeffecient of Hz + ;; Get the coefficient of Hz (let (note) (cond ((setq note (math-freqp expr)) diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index 55ac412b435..60a84bdff35 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -124,7 +124,7 @@ ;; target integral is not complete (and the time limit has not run out) ;; choose an incomplete integral from the cache and, for every integral ;; appearing in its RHS's, add those integrals to the cache using the -;; same substitition, parts, etc. rules. The cache should be organized +;; same substitution, parts, etc. rules. The cache should be organized ;; as a priority queue, choosing the "simplest" incomplete integral at ;; each step, or choosing randomly among equally simple integrals. ;; Simplicity equals small size, and few steps removed from the original @@ -428,7 +428,7 @@ in normal mode." nil "If non-nil, use a separate face to indicate selected sub-formulas. If `calc-show-selections' is non-nil, then selected sub-formulas are shown -by displaying the rest of the formula in `calc-nonselected-face'. +by displaying the rest of the formula in `calc-nonselected-face'. If `calc-show-selections' is nil, then selected sub-formulas are shown by displaying the sub-formula in `calc-selected-face'." :group 'calc @@ -446,14 +446,14 @@ by displaying the sub-formula in `calc-selected-face'." :group 'calc :type '(string)) -(defcustom calc-note-threshold "1" +(defcustom calc-note-threshold "1" "The number of cents that a frequency should be near a note to be identified as that note." :type 'string :group 'calc) (defface calc-nonselected-face - '((t :inherit shadow + '((t :inherit shadow :slant italic)) "Face used to show the non-selected portion of a formula." :group 'calc) diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el index 3ebb7edab3f..d8de171c0a1 100644 --- a/lisp/calendar/cal-menu.el +++ b/lisp/calendar/cal-menu.el @@ -215,13 +215,15 @@ is non-nil." ;; but easymenu does not seem to allow this (?). ;; The ignore-errors is because `documentation' can end up calling ;; this in a non-calendar buffer where displayed-month is unbound. (Bug#3862) +;; This still has issues - bug#9976, so added derived-mode-p call. (defun cal-menu-set-date-title (menu) "Convert date of last event to title suitable for MENU." - (let ((date (ignore-errors (calendar-cursor-to-date nil last-input-event)))) - (if date - (easy-menu-filter-return menu (calendar-date-string date t nil)) - (message "Not on a date!") - nil))) + (when (derived-mode-p 'calendar-mode) + (let ((date (ignore-errors (calendar-cursor-to-date nil last-input-event)))) + (if date + (easy-menu-filter-return menu (calendar-date-string date t nil)) + (message "Not on a date!") + nil)))) (easy-menu-define cal-menu-context-mouse-menu nil "Pop up mouse menu for selected date in the calendar window." diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el index 3ffd55db18d..62bea11e82e 100644 --- a/lisp/calendar/icalendar.el +++ b/lisp/calendar/icalendar.el @@ -112,7 +112,7 @@ ;; Customizables ;; ====================================================================== (defgroup icalendar nil - "Icalendar support." + "iCalendar support." :prefix "icalendar-" :group 'calendar) @@ -234,7 +234,7 @@ code for the event, and your personal domain name." "Enable icalendar debug messages.") ;; ====================================================================== -;; NO USER SERVICABLE PARTS BELOW THIS LINE +;; NO USER SERVICEABLE PARTS BELOW THIS LINE ;; ====================================================================== (defconst icalendar--weekday-array ["SU" "MO" "TU" "WE" "TH" "FR" "SA"]) @@ -474,9 +474,9 @@ The strings are suitable for assembling into a TZ variable." (week (if (eq day -1) byday (substring byday 0 -2)))) - ;; "Translate" the icalendar way to specify the last + ;; "Translate" the iCalendar way to specify the last ;; (sun|mon|...)day in month to the tzset way. - (if (string= week "-1") ; last day as icalendar calls it + (if (string= week "-1") ; last day as iCalendar calls it (setq week "5")) ; last day as tzset calls it (concat "M" bymonth "." week "." (if (eq day -1) "0" (int-to-string day)) @@ -907,7 +907,7 @@ would be \"pm\"." "\\\\," "," string))))) ;; ====================================================================== -;; Export -- convert emacs-diary to icalendar +;; Export -- convert emacs-diary to iCalendar ;; ====================================================================== ;;;###autoload @@ -915,7 +915,7 @@ would be \"pm\"." "Export diary file to iCalendar format. All diary entries in the file DIARY-FILENAME are converted to iCalendar format. The result is appended to the file ICAL-FILENAME." - (interactive "FExport diary data from file: + (interactive "FExport diary data from file: Finto iCalendar file: ") (save-current-buffer (set-buffer (find-file diary-filename)) @@ -1063,7 +1063,7 @@ FExport diary data into iCalendar file: ") found-error)) (defun icalendar--convert-to-ical (nonmarker entry-main) - "Convert a diary entry to icalendar format. + "Convert a diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (or @@ -1194,7 +1194,7 @@ Returns an alist." ;; subroutines for icalendar-export-region (defun icalendar--convert-ordinary-to-ical (nonmarker entry-main) - "Convert \"ordinary\" diary entry to icalendar format. + "Convert \"ordinary\" diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match @@ -1291,7 +1291,7 @@ Returns day number." result)) (defun icalendar--convert-weekly-to-ical (nonmarker entry-main) - "Convert weekly diary entry to icalendar format. + "Convert weekly diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (and (string-match (concat nonmarker @@ -1373,7 +1373,7 @@ entries. ENTRY-MAIN is the first line of the diary entry." nil)) (defun icalendar--convert-yearly-to-ical (nonmarker entry-main) - "Convert yearly diary entry to icalendar format. + "Convert yearly diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker @@ -1453,7 +1453,7 @@ entries. ENTRY-MAIN is the first line of the diary entry." nil)) (defun icalendar--convert-sexp-to-ical (nonmarker entry-main) - "Convert complex sexp diary entry to icalendar format -- unsupported! + "Convert complex sexp diary entry to iCalendar format -- unsupported! FIXME! @@ -1480,7 +1480,7 @@ entries. ENTRY-MAIN is the first line of the diary entry." nil))) (defun icalendar--convert-block-to-ical (nonmarker entry-main) - "Convert block diary entry to icalendar format. + "Convert block diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker @@ -1556,10 +1556,10 @@ entries. ENTRY-MAIN is the first line of the diary entry." nil)) (defun icalendar--convert-float-to-ical (nonmarker entry-main) - "Convert float diary entry to icalendar format -- partially unsupported! - + "Convert float diary entry to iCalendar format -- partially unsupported! + FIXME! DAY from diary-float yet unimplemented. - + NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker "%%\\((diary-float .+\\) ?$") entry-main) @@ -1619,7 +1619,7 @@ entries. ENTRY-MAIN is the first line of the diary entry." nil)) (defun icalendar--convert-date-to-ical (nonmarker entry-main) - "Convert `diary-date' diary entry to icalendar format -- unsupported! + "Convert `diary-date' diary entry to iCalendar format -- unsupported! FIXME! @@ -1635,7 +1635,7 @@ entries. ENTRY-MAIN is the first line of the diary entry." nil)) (defun icalendar--convert-cyclic-to-ical (nonmarker entry-main) - "Convert `diary-cyclic' diary entry to icalendar format. + "Convert `diary-cyclic' diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker @@ -1709,7 +1709,7 @@ entries. ENTRY-MAIN is the first line of the diary entry." nil)) (defun icalendar--convert-anniversary-to-ical (nonmarker entry-main) - "Convert `diary-anniversary' diary entry to icalendar format. + "Convert `diary-anniversary' diary entry to iCalendar format. NONMARKER is a regular expression matching the start of non-marking entries. ENTRY-MAIN is the first line of the diary entry." (if (string-match (concat nonmarker @@ -1783,7 +1783,7 @@ entries. ENTRY-MAIN is the first line of the diary entry." nil)) ;; ====================================================================== -;; Import -- convert icalendar to emacs-diary +;; Import -- convert iCalendar to emacs-diary ;; ====================================================================== ;;;###autoload @@ -1794,8 +1794,8 @@ Argument ICAL-FILENAME output iCalendar file. Argument DIARY-FILENAME input `diary-file'. Optional argument NON-MARKING determines whether events are created as non-marking or not." - (interactive "fImport iCalendar data from file: -Finto diary file: + (interactive "fImport iCalendar data from file: +Finto diary file: p") ;; clean up the diary file (save-current-buffer @@ -1825,19 +1825,19 @@ buffer `*icalendar-errors*'." (interactive) (save-current-buffer ;; prepare ical - (message "Preparing icalendar...") + (message "Preparing iCalendar...") (set-buffer (icalendar--get-unfolded-buffer (current-buffer))) (goto-char (point-min)) - (message "Preparing icalendar...done") + (message "Preparing iCalendar...done") (if (re-search-forward "^BEGIN:VCALENDAR\\s-*$" nil t) (let (ical-contents ical-errors) ;; read ical - (message "Reading icalendar...") + (message "Reading iCalendar...") (beginning-of-line) (setq ical-contents (icalendar--read-element nil nil)) - (message "Reading icalendar...done") + (message "Reading iCalendar...done") ;; convert ical - (message "Converting icalendar...") + (message "Converting iCalendar...") (setq ical-errors (icalendar--convert-ical-to-diary ical-contents diary-file do-not-ask non-marking)) @@ -1848,11 +1848,11 @@ buffer `*icalendar-errors*'." (save-current-buffer (set-buffer b) (save-buffer))))) - (message "Converting icalendar...done") + (message "Converting iCalendar...done") ;; return t if no error occurred (not ical-errors)) (message - "Current buffer does not contain icalendar contents!") + "Current buffer does not contain iCalendar contents!") ;; return nil, i.e. import did not work nil))) @@ -2056,12 +2056,12 @@ written into the buffer `*icalendar-errors*'." (set-buffer (get-buffer-create "*icalendar-errors*")) (erase-buffer) (insert error-string))) - (message "Converting icalendar...done") + (message "Converting iCalendar...done") found-error)) ;; subroutines for importing (defun icalendar--convert-recurring-to-diary (e dtstart-dec start-t end-t) - "Convert recurring icalendar event E to diary format. + "Convert recurring iCalendar event E to diary format. DTSTART-DEC is the DTSTART property of E. START-T is the event's start time in diary format. @@ -2274,7 +2274,7 @@ END-T is the event's end time in diary format." result)) (defun icalendar--convert-non-recurring-all-day-to-diary (event start-d end-d) - "Convert non-recurring icalendar EVENT to diary format. + "Convert non-recurring iCalendar EVENT to diary format. DTSTART is the decoded DTSTART property of E. Argument START-D gives the first day. @@ -2339,7 +2339,7 @@ the entry." ;; Examples ;; ====================================================================== (defun icalendar-import-format-sample (event) - "Example function for formatting an icalendar EVENT." + "Example function for formatting an iCalendar EVENT." (format (concat "SUMMARY=`%s' DESCRIPTION=`%s' LOCATION=`%s' ORGANIZER=`%s' " "STATUS=`%s' URL=`%s' CLASS=`%s'") (or (icalendar--get-event-property event 'SUMMARY) "") diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el index 1ec474e828e..c9b8fdac613 100644 --- a/lisp/calendar/timeclock.el +++ b/lisp/calendar/timeclock.el @@ -407,7 +407,7 @@ discover the reason." (if arg (run-hooks 'timeclock-done-hook)))) -;; Should today-only be removed in favour of timeclock-relative? - gm +;; Should today-only be removed in favor of timeclock-relative? - gm (defsubst timeclock-workday-remaining (&optional today-only) "Return the number of seconds until the workday is complete. The amount returned is relative to the value of `timeclock-workday'. @@ -547,7 +547,7 @@ non-nil, the amount returned will be relative to past time worked." (defalias 'timeclock-seconds-to-time 'seconds-to-time) -;; Should today-only be removed in favour of timeclock-relative? - gm +;; Should today-only be removed in favor of timeclock-relative? - gm (defsubst timeclock-when-to-leave (&optional today-only) "Return a time value representing the end of today's workday. If TODAY-ONLY is non-nil, the value returned will be relative only to @@ -569,7 +569,7 @@ This string is relative to the value of `timeclock-workday'. If SHOW-SECONDS is non-nil, the value printed/returned will include seconds. If TODAY-ONLY is non-nil, the value returned will be relative only to the time worked today, and not to past time." - ;; Should today-only be removed in favour of timeclock-relative? - gm + ;; Should today-only be removed in favor of timeclock-relative? - gm (interactive) (let* ((then (timeclock-when-to-leave today-only)) (string diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el index 4c59e2634ae..b0c7f125982 100644 --- a/lisp/calendar/todo-mode.el +++ b/lisp/calendar/todo-mode.el @@ -31,7 +31,7 @@ ;; TODO is a major mode for EMACS which offers functionality to ;; treat most lines in one buffer as a list of items one has to ;; do. There are facilities to add new items, which are -;; categorised, to edit or even delete items from the buffer. +;; categorized, to edit or even delete items from the buffer. ;; The buffer contents are currently compatible with the diary, ;; so that the list of todo-items will show up in the FANCY diary ;; mode. @@ -536,7 +536,7 @@ Use `todo-categories' instead.") (unless (zerop (buffer-size buf)) (and (null todo-categories) (null todo-cats) - (error "Error in %s: File is non-empty but contains no category" + (error "Error in %s: File is non-empty but contains no category" todo-file-do))) (unless cat (setq cat (read-from-minibuffer prompt))) (with-current-buffer buf diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog index 3dd0e6f78fd..e5969a3c291 100644 --- a/lisp/cedet/ChangeLog +++ b/lisp/cedet/ChangeLog @@ -1,3 +1,64 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * semantic/lex.el (semantic-lex-tokens): + * semantic/tag-ls.el (semantic-tag-protected-p): + * srecode/mode.el (srecode-prefix-map): Fix typos. + +2011-11-15 Juanma Barranquero <lekktu@gmail.com> + + * ede/project-am.el (project-compile-target-command): Fix typo. + +2011-11-14 Juanma Barranquero <lekktu@gmail.com> + + * ede/auto.el (ede-project-autoload): + * ede/proj-comp.el (ede-makefile-rule): + * semantic/analyze.el (semantic-analyze-current-context): + * semantic/ctxt.el (semantic-get-local-variables): + * semantic/tag-ls.el (semantic-tag-calculate-parent): Fix typos. + +2011-11-03 David Engster <dengste@eml.cc> + + * srecode.el: + * srecode/texi.el: + * srecode/template.el: + * srecode/java.el: + * srecode/insert.el: + * srecode/document.el: + * srecode/dictionary.el: + * srecode/compile.el: + * semantic/wisent/java-tags.el: + * semantic/texi.el: + * semantic/sort.el: + * semantic/lex-spp.el: + * semantic/idle.el: + * semantic/html.el: + * semantic/db-typecache.el: + * semantic/analyze/complete.el: + * ede/generic.el: + * ede/custom.el: + * ede/cpp-root.el: + * ede/base.el: Fix filenames in comments and headers. + + * semantic/db-find.el: + * srecode/insert.el (srecode-insert-include-lookup): + * ede/proj-comp.el (ede-compilation-program): Fix it's -> its in + comments and docstrings. + + * semantic/ctxt.el (semantic-end-of-context-default): + * semantic/find.el (semantic-find-tags-by-scope-protection): + * semantic/java.el (semantic-documentation-for-tag): Fix typos in + docstrings. + + * semantic/db.el (semanticdb-table, semanticdb-abstract-cache) + (semanticdb-abstract-db-cache): + * semantic/decorate/include.el + (semantic-decoration-unknown-include-describe): Fix filenames in + docstring. + + * semantic/ede-grammar.el (semantic-ede-grammar-compiler-wisent): + (semantic-ede-grammar-compiler-bovine): Fix requires that are + added to the grammar-make-script. + 2011-10-23 Chong Yidong <cyd@gnu.org> * ede.el (ede-maybe-checkout): Function deleted; @@ -401,7 +462,7 @@ * semantic/decorate/include.el (semantic-decoration-on-unknown-includes): Change light bgcolor. (semantic-decoration-on-includes-highlight-default): Check that - the include tag has a postion. + the include tag has a position. * semantic/complete.el (semantic-collector-local-members): (semantic-complete-read-tag-local-members) @@ -504,7 +565,7 @@ (semantic-analyzer-debug-missing-innertype): Change "prefix" to "symbol" in messages. - * semantic/analyze/refs.el: (semantic-analyze-refs-impl) + * semantic/analyze/refs.el (semantic-analyze-refs-impl) (semantic-analyze-refs-proto): When calculating value, make sure the found tag is 'similar' to the originating tag. (semantic--analyze-refs-find-tags-with-parent): Attempt to diff --git a/lisp/cedet/cedet.el b/lisp/cedet/cedet.el index d2fb066515b..d7645bc97ed 100644 --- a/lisp/cedet/cedet.el +++ b/lisp/cedet/cedet.el @@ -75,7 +75,7 @@ This is used by `semantic-mode' and `global-ede-mode'.") (defun cedet-version () - "Display all active versions of CEDET and Dependant packages. + "Display all active versions of CEDET and Dependent packages. The PACKAGE column is the name of a given package from CEDET. diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el index cd910f35a6a..e50e9993af0 100644 --- a/lisp/cedet/data-debug.el +++ b/lisp/cedet/data-debug.el @@ -955,7 +955,7 @@ we move to." (defun data-debug-line-expandable-p () "Return non-nil if the current line is expandable. -Lines that are not expandable are assumed to not be contractable." +Lines that are not expandable are assumed to not be contractible." (not (get-text-property (point) 'ddebug-noexpand))) (defun data-debug-expand-current-line () diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el index 14f09517b1d..987351a25e0 100644 --- a/lisp/cedet/ede.el +++ b/lisp/cedet/ede.el @@ -909,7 +909,7 @@ Optional ROOTRETURN will return the root project for DIR." ;; recomment as we go ;;nil )) - ;; Do nothing if we are buiding an EDE project already + ;; Do nothing if we are building an EDE project already. (ede-constructing nil) ;; Load in the project in question. diff --git a/lisp/cedet/ede/auto.el b/lisp/cedet/ede/auto.el index 09535ffce6b..d08ab543b82 100644 --- a/lisp/cedet/ede/auto.el +++ b/lisp/cedet/ede/auto.el @@ -49,7 +49,7 @@ routine instead.") :documentation "Initializers passed to the project object. These are used so there can be multiple types of projects -associated with a single object class, based on the initilizeres used.") +associated with a single object class, based on the initializers used.") (load-type :initarg :load-type :documentation "Fn symbol used to load this project file.") (class-sym :initarg :class-sym diff --git a/lisp/cedet/ede/base.el b/lisp/cedet/ede/base.el index da36919b23a..8b0bd261daf 100644 --- a/lisp/cedet/ede/base.el +++ b/lisp/cedet/ede/base.el @@ -413,7 +413,7 @@ Specifying PARENT is useful for sub-sub projects relative to the root project." (defmethod ede-subproject-p ((proj ede-project)) "Return non-nil if PROJ is a sub project." ;; @TODO - Use this in more places, and also pay attention to - ;; metasubproject in ede-proj.el + ;; metasubproject in ede/proj.el (ede-parent-project proj)) diff --git a/lisp/cedet/ede/cpp-root.el b/lisp/cedet/ede/cpp-root.el index 7586522355e..e4d1bf205ec 100644 --- a/lisp/cedet/ede/cpp-root.el +++ b/lisp/cedet/ede/cpp-root.el @@ -21,7 +21,7 @@ ;;; Commentary: ;; -;; NOTE: ede-cpp-root.el has been commented so as to also make it +;; NOTE: ede/cpp-root.el has been commented so as to also make it ;; useful for learning how to make similar project types. ;; ;; Not everyone can use automake, or an EDE project type. For diff --git a/lisp/cedet/ede/custom.el b/lisp/cedet/ede/custom.el index a7470547cc2..ac0907e8e7f 100644 --- a/lisp/cedet/ede/custom.el +++ b/lisp/cedet/ede/custom.el @@ -1,4 +1,4 @@ -;;; ede.el --- customization of EDE projects. +;;; ede/custom.el --- customization of EDE projects. ;; Copyright (C) 2010-2011 Free Software Foundation, Inc. @@ -40,7 +40,7 @@ ;;; Customization Commands ;; -;; These commands initialize custoization of EDE control objects. +;; These commands initialize customization of EDE control objects. ;;;###autoload (defun ede-customize-project () diff --git a/lisp/cedet/ede/emacs.el b/lisp/cedet/ede/emacs.el index b8759dd06ee..c1ca8b69208 100644 --- a/lisp/cedet/ede/emacs.el +++ b/lisp/cedet/ede/emacs.el @@ -63,7 +63,7 @@ DIR is the directory to search from." (if proj (ede-up-directory (file-name-directory (oref proj :file))) - ;; No pre-existing project. Lets take a wild-guess if we have + ;; No pre-existing project. Let's take a wild-guess if we have ;; an Emacs project here. (when (string-match "emacs[^/]*" dir) (let ((base (substring dir 0 (match-end 0)))) @@ -121,7 +121,7 @@ Return nil if there isn't one. Argument DIR is the directory it is created for. ROOTPROJ is nil, since there is only one project." (or (ede-emacs-file-existing dir) - ;; Doesn't already exist, so lets make one. + ;; Doesn't already exist, so let's make one. (let* ((vertuple (ede-emacs-version dir))) (ede-emacs-project (car vertuple) :name (car vertuple) diff --git a/lisp/cedet/ede/files.el b/lisp/cedet/ede/files.el index 3d165c39016..6179d304464 100644 --- a/lisp/cedet/ede/files.el +++ b/lisp/cedet/ede/files.el @@ -101,7 +101,7 @@ of the anchor file for the project." (setq ans SP) (ede-find-subproject-for-directory SP dir))))) ans) - ;; We can use inodes, so lets try it. + ;; We can use inodes, so let's try it. (let ((ans nil) (inode (ede--inode-for-dir dir))) (ede-map-subprojects diff --git a/lisp/cedet/ede/generic.el b/lisp/cedet/ede/generic.el index 360b15499ca..7efe534a640 100644 --- a/lisp/cedet/ede/generic.el +++ b/lisp/cedet/ede/generic.el @@ -22,7 +22,7 @@ ;;; Commentary: ;; ;; There are a lot of build systems out there, and EDE can't support -;; them all fully. The ede-generic.el system is the base for +;; them all fully. The ede/generic.el system is the base for ;; supporting alternate build systems in a simple way, automatically. ;; ;; The structure is for the ede-generic baseclass, which is augmented @@ -46,7 +46,7 @@ ;; Since these projects are all so increadibly generic, a user will ;; need to configure some aspects of the project by hand. In order to ;; enable this without configuring the project objects directly (which -;; are auto-generated) a special ede-generic-confg object is defined to +;; are auto-generated) a special ede-generic-config object is defined to ;; hold the basics. Generic projects will identify and use these ;; config files. ;; @@ -70,7 +70,7 @@ ;; subclasses `ede-generic-target'. The slots `shortname' and ;; `extension' should be given new initial values. ;; -;; Optionally, any target method used by EDE can then be overriden. +;; Optionally, any target method used by EDE can then be overridden. ;; The ede-generic-target-c-cpp has some example methods setting up ;; the pre-processor map and system include path. ;; @@ -105,7 +105,7 @@ :group (default build) :documentation "Command used for debugging this project.") - ;; C target customixations + ;; C target customizations (c-include-path :initarg :c-include-path :initform nil :type list @@ -133,7 +133,7 @@ Return nil if there isn't one. Argument DIR is the directory it is created for. ROOTPROJ is nil, since there is only one project." - ;; Doesn't already exist, so lets make one. + ;; Doesn't already exist, so let's make one. (let* ((alobj ede-constructing) (this nil)) (when (not alobj) (error "Cannot load generic project without the autoload instance")) @@ -249,7 +249,7 @@ All directories need at least one target.") "EDE Generic Project target for Misc files. All directories need at least one target.") -;;; Automatic target aquisition. +;;; Automatic target acquisition. (defun ede-generic-find-matching-target (class dir targets) "Find a target that is a CLASS and is in DIR in the list of TARGETS." (let ((match nil)) diff --git a/lisp/cedet/ede/linux.el b/lisp/cedet/ede/linux.el index e11286c710e..0ed9c3054ef 100644 --- a/lisp/cedet/ede/linux.el +++ b/lisp/cedet/ede/linux.el @@ -62,7 +62,7 @@ DIR is the directory to search from." (if proj (ede-up-directory (file-name-directory (oref proj :file))) - ;; No pre-existing project. Lets take a wild-guess if we have + ;; No pre-existing project. Let's take a wild-guess if we have ;; an Linux project here. (when (string-match "linux[^/]*" dir) (let ((base (substring dir 0 (match-end 0)))) @@ -101,7 +101,7 @@ Return nil if there isn't one. Argument DIR is the directory it is created for. ROOTPROJ is nil, since there is only one project." (or (ede-linux-file-existing dir) - ;; Doesn't already exist, so lets make one. + ;; Doesn't already exist, so let's make one. (ede-linux-project "Linux" :name "Linux" :version (ede-linux-version dir) diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el index 63991c54e7f..718fdf58b11 100644 --- a/lisp/cedet/ede/makefile-edit.el +++ b/lisp/cedet/ede/makefile-edit.el @@ -71,7 +71,7 @@ (end-of-line) (= (preceding-char) ?\\))) -;;; Programatic editing of a Makefile +;;; Programmatic editing of a Makefile ;; (defun makefile-move-to-macro (macro &optional next) "Move to the definition of MACRO. Return t if found. diff --git a/lisp/cedet/ede/pconf.el b/lisp/cedet/ede/pconf.el index 08fc98728e1..05290158189 100644 --- a/lisp/cedet/ede/pconf.el +++ b/lisp/cedet/ede/pconf.el @@ -149,7 +149,7 @@ don't do it. A value of nil means to just do it.") )))) (defmethod ede-proj-configure-recreate ((this ede-proj-project)) - "Delete project THISes configure script and start over." + "Delete project THIS's configure script and start over." (if (not (ede-proj-configure-file this)) (error "Could not determine configure.ac for %S" (object-name this))) (let ((b (get-file-buffer (ede-proj-configure-file this)))) diff --git a/lisp/cedet/ede/proj-comp.el b/lisp/cedet/ede/proj-comp.el index 401ea15d0d6..ae5796e042b 100644 --- a/lisp/cedet/ede/proj-comp.el +++ b/lisp/cedet/ede/proj-comp.el @@ -83,7 +83,7 @@ For example, yacc/lex files need additional chain rules, or inferences.") :documentation "The commands used to execute this compiler. The object which uses this compiler will place these commands after -it's rule definition.") +its rule definition.") (autoconf :initarg :autoconf :initform nil :type list @@ -149,7 +149,7 @@ belonging to the target name.") :type list :custom (repeat string) :documentation "Scripts to execute. -These scripst will be executed in sh (Unless the SHELL variable is overriden). +These scripts will be executed in sh (Unless the SHELL variable is overridden). Do not prefix with TAB. Each individual element of this list can be either a string, or a lambda function. (The custom element does not yet express that.") diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el index 42a20cc4a1a..66c71063363 100644 --- a/lisp/cedet/ede/proj-elisp.el +++ b/lisp/cedet/ede/proj-elisp.el @@ -217,7 +217,7 @@ is found, such as a `-version' variable, or the standard header." (save-excursion (if (file-symlink-p ec) (progn - ;; Desymlinkafy + ;; Desymlinkify (rename-file ec (concat ec ".tmp")) (copy-file (concat ec ".tmp") ec) (delete-file (concat ec ".tmp")))) diff --git a/lisp/cedet/ede/proj-misc.el b/lisp/cedet/ede/proj-misc.el index 4d68e1544a7..1c9b9bea0f4 100644 --- a/lisp/cedet/ede/proj-misc.el +++ b/lisp/cedet/ede/proj-misc.el @@ -50,7 +50,7 @@ All listed sources are included in the distribution.") (defvar ede-misc-source (ede-sourcecode "ede-misc-source" - :name "Miscelaneous" + :name "Miscellaneous" :sourcepattern ".*") "Miscellaneous field definition.") diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el index 40e6165251c..79022be6a5f 100644 --- a/lisp/cedet/ede/proj.el +++ b/lisp/cedet/ede/proj.el @@ -584,7 +584,7 @@ Converts all symbols into the objects to be used." link))) -;;; Target type specific autogenerating gobbldegook. +;;; Target type specific autogenerating gobbledygook. ;; (defun ede-proj-makefile-type (&optional proj) diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el index ec54d8151bc..316309092e7 100644 --- a/lisp/cedet/ede/project-am.el +++ b/lisp/cedet/ede/project-am.el @@ -428,7 +428,7 @@ Argument COMMAND is the command to use for compiling the target." If a given set of projects has already been loaded, then do nothing but return the project for the directory given. Optional ROOTPROJ is the root EDE project." - (let* ((ede-constructiong t) + (let* ((ede-constructing t) (amo (object-assoc (expand-file-name "Makefile.am" directory) 'file ede-projects))) (when (not amo) @@ -659,7 +659,7 @@ Strip out duplicates, and recurse on variables." ;; their object still exists! ;; FIGURE THIS OUT (project-am-expand-subdirlist 'csubprojexpanded csubproj) - ;; Ok, now lets look at all our sub-projects. + ;; Ok, now let's look at all our sub-projects. (mapc (lambda (sp) (let* ((subdir (file-name-as-directory (expand-file-name @@ -836,7 +836,7 @@ nil means that this buffer belongs to no-one." (oref this :name)) (defmethod project-compile-target-command ((this project-am-texinfo)) - "Default target t- use when compling a texinfo file." + "Default target t- use when compiling a texinfo file." (let ((n (oref this :name))) (if (string-match "\\.texi?\\(nfo\\)?" n) (setq n (replace-match ".info" t t n))) diff --git a/lisp/cedet/ede/speedbar.el b/lisp/cedet/ede/speedbar.el index 252ce47df67..fdf61b51b68 100644 --- a/lisp/cedet/ede/speedbar.el +++ b/lisp/cedet/ede/speedbar.el @@ -297,7 +297,7 @@ INDENT is the current indentation level." (let ((file (ede-find-nearest-file-line))) (speedbar-find-file-in-frame file) (save-excursion (speedbar-stealthy-updates)) - ;; Reset the timer with a new timeout when cliking a file + ;; Reset the timer with a new timeout when clicking a file ;; in case the user was navigating directories, we can cancel ;; that other timer. ; (speedbar-set-timer speedbar-update-speed) diff --git a/lisp/cedet/inversion.el b/lisp/cedet/inversion.el index 71960ddecd4..065ac6d0559 100644 --- a/lisp/cedet/inversion.el +++ b/lisp/cedet/inversion.el @@ -419,7 +419,7 @@ INSTALLDIR path." ;;(message "%S added to `load-path'" default-directory) (add-to-list 'load-path default-directory)) ;; We get to this point iff we do not accept or there is no - ;; system file. Lets check the version of what we just + ;; system file. Let's check the version of what we just ;; installed... just to be safe. (let ((newver (inversion-find-version package))) (if (not newver) diff --git a/lisp/cedet/mode-local.el b/lisp/cedet/mode-local.el index d077dd95f3c..0e7657642c2 100644 --- a/lisp/cedet/mode-local.el +++ b/lisp/cedet/mode-local.el @@ -637,7 +637,7 @@ SYMBOL is a function that can be overridden." (defun mode-local-print-bindings (table) "Print bindings in TABLE." - (let (us ;; List of unpecified symbols + (let (us ;; List of unspecified symbols mc ;; List of mode local constants mv ;; List of mode local variables ov ;; List of overloaded functions @@ -656,7 +656,7 @@ SYMBOL is a function that can be overridden." table) ;; Print symbols by type (when us - (princ "\n !! Unpecified symbols\n") + (princ "\n !! Unspecified symbols\n") (mapc 'mode-local-print-binding us)) (when mc (princ "\n ** Mode local constants\n") diff --git a/lisp/cedet/pulse.el b/lisp/cedet/pulse.el index 74dc1ecde31..e3d2bd967b6 100644 --- a/lisp/cedet/pulse.el +++ b/lisp/cedet/pulse.el @@ -77,7 +77,7 @@ this flag is ignored." (:background "#AAAA33")) (((class color) (background light)) (:background "#FFFFAA"))) - "*Face used at beginning of a highight." + "*Face used at beginning of a highlight." :group 'pulse) (defface pulse-highlight-face diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el index 34d886b6807..639b46ad2cf 100644 --- a/lisp/cedet/semantic.el +++ b/lisp/cedet/semantic.el @@ -1015,7 +1015,7 @@ Throw away all the old tags, and recreate the tag database." :visible semantic-mode :button (:toggle . global-semanticdb-minor-mode)))) -;; The `semantic-mode' command, in conjuction with the +;; The `semantic-mode' command, in conjunction with the ;; `semantic-default-submodes' variable, toggles Semantic's various ;; auxiliary minor modes. diff --git a/lisp/cedet/semantic/analyze.el b/lisp/cedet/semantic/analyze.el index 5cdd1577a6e..43e998b852e 100644 --- a/lisp/cedet/semantic/analyze.el +++ b/lisp/cedet/semantic/analyze.el @@ -106,7 +106,7 @@ called in a dereference sequence.") (prefixclass :initarg :prefixclass :type list :documentation "Tag classes expected at this context. -These are clases for tags, such as 'function, or 'variable.") +These are classes for tags, such as 'function, or 'variable.") (prefixtypes :initarg :prefixtypes :type list :documentation "List of tags defining types for :prefix. @@ -287,7 +287,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error ;; For the middle entries (while s - ;; Using the tag found in TMP, lets find the tag + ;; Using the tag found in TMP, let's find the tag ;; representing the full typeographic information of its ;; type, and use that to determine the search context for ;; (car s) @@ -302,7 +302,7 @@ Optional argument THROWSYM specifies a symbol the throw on non-recoverable error (mapcar 'semantic-tag-type-members tagtype)))) (oset miniscope fullscope rawscope))) - ;; Now analayze the type to remove metatypes. + ;; Now analyze the type to remove metatypes. (or (semantic-analyze-type tmp miniscope) tmp)) (t @@ -476,7 +476,7 @@ If called interactively, display interesting information about POSITION in a separate buffer. Returns an object based on symbol `semantic-analyze-context'. -This function can be overriden with the symbol `analyze-context'. +This function can be overridden with the symbol `analyze-context'. When overriding this function, your override will be called while cursor is at POSITION. In addition, your function will not be called if a cached copy of the return object is found." diff --git a/lisp/cedet/semantic/analyze/complete.el b/lisp/cedet/semantic/analyze/complete.el index bbe87f34172..89937f45ec8 100644 --- a/lisp/cedet/semantic/analyze/complete.el +++ b/lisp/cedet/semantic/analyze/complete.el @@ -28,7 +28,7 @@ ;; ;;; History: ;; -;; Code was moved here from semantic-analyze.el +;; Code was moved here from semantic/analyze.el (require 'semantic/analyze) @@ -188,7 +188,7 @@ FLAGS can be any number of: ;; Reset c. (setq c nil) - ;; Loop over all the found matches, and catagorize them + ;; Loop over all the found matches, and categorize them ;; as being possible features. (while (and loopc do-typeconstraint) diff --git a/lisp/cedet/semantic/bovine.el b/lisp/cedet/semantic/bovine.el index 1dfbb72d416..036a6f38724 100644 --- a/lisp/cedet/semantic/bovine.el +++ b/lisp/cedet/semantic/bovine.el @@ -240,7 +240,7 @@ list of semantic tokens found." matchlist nil) ;;generate exit condition (if (not end) (setq out nil))) - ;; Nothin? + ;; Nothing? )) (setq result (if (eq s starting-stream) diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el index 0b3e6881891..d8b004df1bd 100644 --- a/lisp/cedet/semantic/bovine/c.el +++ b/lisp/cedet/semantic/bovine/c.el @@ -240,7 +240,7 @@ Return the defined symbol as a special spp lex token." (goto-char (match-end 0)) (looking-at "("))) (semantic-lex-spp-replacements-enabled nil) - ;; Temporarilly override the lexer to include + ;; Temporarily override the lexer to include ;; special items needed inside a macro (semantic-lex-analyzer #'semantic-cpp-lexer) (raw-stream @@ -249,7 +249,7 @@ Return the defined symbol as a special spp lex token." (point)))) ) - ;; Only do argument checking if the paren was immediatly after + ;; Only do argument checking if the paren was immediately after ;; the macro name. (if with-args (semantic-lex-spp-first-token-arg-list (car raw-stream))) @@ -1092,7 +1092,7 @@ Optional argument STAR and REF indicate the number of * and & in the typedef." ;; `throws' as a common name for things that toss ;; exceptions about. :throws (nth 5 tokenpart) - ;; Reemtrant is a C++ thingy. Add it here + ;; Reentrant is a C++ thingy. Add it here :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t) ;; A function post-const is funky. Try stuff :methodconst-flag (if (member "const" (nth 6 tokenpart)) t) @@ -1128,7 +1128,7 @@ Optional PARENT and COLOR are ignored." (define-mode-local-override semantic-format-tag-canonical-name c-mode (tag &optional parent color) - "Create a cannonical name for TAG. + "Create a canonical name for TAG. PARENT specifies a parent class. COLOR indicates that the text should be type colorized. Enhances the base class to search for the entire parent diff --git a/lisp/cedet/semantic/bovine/el.el b/lisp/cedet/semantic/bovine/el.el index cfdd4cf6f6c..2151e9ef53b 100644 --- a/lisp/cedet/semantic/bovine/el.el +++ b/lisp/cedet/semantic/bovine/el.el @@ -463,7 +463,7 @@ Return a bovination list to use." ;; Try an Emacs 22 fcn. This throws errors. (find-library-name (semantic-tag-name tag)) (error - (message "semantic: connot find source file %s" + (message "semantic: cannot find source file %s" (semantic-tag-name tag)))) ;; No handy function available. (Older Emacsen) (let* ((lib (locate-library (semantic-tag-name tag))) @@ -515,7 +515,7 @@ Optional argument NOSNARF is ignored." (let ((d (semantic-tag-docstring tag))) (when (not d) (cond ((semantic-tag-with-position-p tag) - ;; Doc isn't in the tag itself. Lets pull it out of the + ;; Doc isn't in the tag itself. Let's pull it out of the ;; sources. (let ((semantic-elisp-store-documentation-in-tag t)) (setq tag (with-current-buffer (semantic-tag-buffer tag) @@ -534,9 +534,9 @@ Optional argument NOSNARF is ignored." (t (setq d (documentation-property sym 'variable-documentation))))) - ;; Label it as system doc.. perhaps just for debugging + ;; Label it as system doc. perhaps just for debugging ;; purposes. - (if d (setq d (concat "Sytem Doc: \n" d))) + (if d (setq d (concat "System Doc: \n" d))) )) ) @@ -823,7 +823,7 @@ In Emacs Lisp this is easily defined by parenthesis bounding." (&optional point) "Return a list of tag classes allowed at POINT. Emacs Lisp knows much more about the class of the tag needed to perform -completion than some languages. We distincly know if we are to be a +completion than some languages. We distinctly know if we are to be a function name, variable name, or any type of symbol. We could identify fields and such to, but that is for some other day." (save-excursion diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 18c7b5a1a50..41a569564d0 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -54,7 +54,7 @@ ;; ;; Here, we will treat each section separately (excluding D) ;; They can then be strung together in user-visible commands to -;; fulfil specific needs. +;; fulfill specific needs. ;; ;; COLLECTORS: ;; @@ -891,7 +891,7 @@ making the action of homing in on a token faster.") This completion is calculated and saved for future use.") (last-whitespace-completion :type (or null string) :documentation "The last whitespace completion. -For partial completion, SPC will disabiguate over whitespace type +For partial completion, SPC will disambiguate over whitespace type characters. This is the last calculated version.") (current-exact-match :type list :protection :protected @@ -1353,7 +1353,7 @@ to click on the items to aid in completion.") (defmethod semantic-displayor-show-request ((obj semantic-displayor-traditional)) "A request to show the current tags table." - ;; NOTE TO SELF. Find the character to type next, and emphesize it. + ;; NOTE TO SELF. Find the character to type next, and emphasize it. (with-output-to-temp-buffer "*Completions*" (display-completion-list @@ -1377,7 +1377,7 @@ given tag, by highlighting its location.") ) "Abstract displayor supporting `focus'. A displayor which has the ability to focus in on one tag. -Focusing is a way of differentiationg between multiple tags +Focusing is a way of differentiating among multiple tags which have the same name." :abstract t) @@ -1618,7 +1618,7 @@ Display mechanism using tooltip for a list of possible completions.") (string= (this-command-keys) "\C-i")) (oset obj typing-count (1+ typing-count))) ;; At this point, we know we have too many items. - ;; Lets be brave, and truncate l + ;; Let's be brave, and truncate l (setcdr (nthcdr (oref obj max-tags) l) nil) (setq msg (mapconcat 'identity l "\n")) (cond diff --git a/lisp/cedet/semantic/ctxt.el b/lisp/cedet/semantic/ctxt.el index 08049201756..4fef5937bc3 100644 --- a/lisp/cedet/semantic/ctxt.el +++ b/lisp/cedet/semantic/ctxt.el @@ -106,7 +106,7 @@ Return non-nil if there is no upper context." (let ((start (point))) (if (semantic-up-context) t - ;; Go over the list, and back over the end parenthisis. + ;; Go over the list, and back over the end parenthesis. (condition-case nil (progn (forward-sexp 1) @@ -154,7 +154,7 @@ Return non-nil if there is no upper context." (define-overloadable-function semantic-get-local-variables (&optional point) "Get the local variables based on POINT's context. Local variables are returned in Semantic tag format. -This can be overriden with `get-local-variables'." +This can be overridden with `get-local-variables'." ;; Disable parsing messages (let ((semantic--progress-reporter nil)) (save-excursion @@ -410,7 +410,7 @@ Depends on `semantic-type-relation-separator-character'." ;; Set our end point. (setq end (point)) - ;; Now that we have gotten started, lets do the rest. + ;; Now that we have gotten started, let's do the rest. (condition-case nil (while (save-excursion (forward-char -1) diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el index d719fde3174..fe5f3c193df 100644 --- a/lisp/cedet/semantic/db-ebrowse.el +++ b/lisp/cedet/semantic/db-ebrowse.el @@ -219,7 +219,7 @@ warn instead." ;JAVE this just instantiates a default empty ebrowse struct? ; how would new instances wind up here? -; the ebrowse class isnt singleton, unlike the emacs lisp one +; the ebrowse class isn't singleton, unlike the emacs lisp one (defvar-mode-local c++-mode semanticdb-project-system-databases () "Search Ebrowse for symbols.") @@ -296,7 +296,7 @@ If there is no database for DIRECTORY available, then (when (string= (oref (car dbs) reference-directory) directory) (setq found (car dbs)))) (setq dbs (cdr dbs))) - ;;STATIC means DBE cant be used as object, only as a class + ;;STATIC means DBE can't be used as object, only as a class (let* ((ebrowse-data (semanticdb-ebrowse-get-ebrowse-structure directory)) (dat (car (cdr ebrowse-data))) (ebd (car dat)) @@ -331,7 +331,7 @@ If there is no database for DIRECTORY available, then ;JAVE what it actually seems to do is split the original tree in "tables" associated with files ; im not sure it actually works: ; the filename slot sometimes gets to be nil, -; apparently for classes which definition cant be found, yet needs to be included in the tree +; apparently for classes which definition can't be found, yet needs to be included in the tree ; like library baseclasses ; a file can define several classes (let ((T (car (cdr data))));1st comes a header, then the tree diff --git a/lisp/cedet/semantic/db-file.el b/lisp/cedet/semantic/db-file.el index 661bc8d6841..943ccf23031 100644 --- a/lisp/cedet/semantic/db-file.el +++ b/lisp/cedet/semantic/db-file.el @@ -289,7 +289,7 @@ Argument OBJ is the object to write." (when (and (boundp semantic-show-unmatched-syntax-mode) semantic-show-unmatched-syntax-mode) ;; Only do this if the user runs unmatched syntax - ;; mode display enties. + ;; mode display entries. (oset obj unmatched-syntax (semantic-show-unmatched-lex-tokens-fetch)) ) diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index a7335d642be..35aef5d16ef 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -79,13 +79,13 @@ ;; The PATH argument is then the most interesting argument. It can ;; have these values: ;; -;; nil - Take the current buffer, and use it's include list +;; nil - Take the current buffer, and use its include list ;; buffer - Use that buffer's include list. ;; filename - Use that file's include list. If the file is not ;; in a buffer, see of there is a semanticdb table for it. If ;; not, read that file into a buffer. ;; tag - Get that tag's buffer of file file. See above. -;; table - Search that table, and it's include list. +;; table - Search that table, and its include list. ;; ;; Search Results: ;; @@ -862,7 +862,7 @@ instead." (let ((tab (car (car tmp))) (tags (cdr (car tmp)))) (dolist (T tags) - ;; Normilzation gives specialty database tables a chance + ;; Normalization gives specialty database tables a chance ;; to convert into a more stable tag format. (let* ((norm (semanticdb-normalize-one-tag tab T)) (ntab (car norm)) @@ -918,7 +918,7 @@ but should be good enough for debugging assertions." result " ") ">") - ;; Longer results should have an abreviated form. + ;; Longer results should have an abbreviated form. (format "#<FIND RESULT %d TAGS in %d FILES>" (semanticdb-find-result-length result) (length result)))) diff --git a/lisp/cedet/semantic/db-typecache.el b/lisp/cedet/semantic/db-typecache.el index 2a78576092a..a4c4bd99f26 100644 --- a/lisp/cedet/semantic/db-typecache.el +++ b/lisp/cedet/semantic/db-typecache.el @@ -1,4 +1,4 @@ -;;; db-typecache.el --- Manage Datatypes +;;; semantic/db-typecache.el --- Manage Datatypes ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. @@ -97,7 +97,7 @@ Said object must support `semantic-reset' methods.") (when (semantic-find-tags-by-class 'type new-tags) ;; Reset our index (oset tc filestream nil) - t ;; Return true, our core file tags have changed in a relavant way. + t ;; Return true, our core file tags have changed in a relevant way. ) ;; NO CODE HERE @@ -368,7 +368,7 @@ a master list." (semanticdb-typecache-merge-streams incstream ;; Getting the cache from this table will also cause this - ;; file to update it's cache from it's decendants. + ;; file to update its cache from its decendents. ;; ;; In theory, caches are only built for most includes ;; only once (in the loop before this one), so this ends @@ -473,7 +473,7 @@ found tag to be loaded." ;; find a type/namespace because everything else is excluded. ;; If this is not the last entry from the list, then it - ;; must be a type or a namespace. Lets double check. + ;; must be a type or a namespace. Let's double check. (when (cdr type) ;; From above, there is only one tag in ans, and we prefer @@ -511,7 +511,7 @@ found tag to be loaded." ;; This won't liven up the tag since we have a copy, but ;; we ought to be able to get there and go to the right line. (find-file-noselect lastfile) - ;; We don't want to find-file match, so instead lets + ;; We don't want to find-file match, so instead let's ;; push the filename onto the return tag. (when lastans (setq lastans (semantic-tag-copy lastans nil lastfile)) @@ -622,4 +622,4 @@ If there isn't one, create it. ;; generated-autoload-load-name: "semantic/db-typecache" ;; End: -;;; semanticdb-typecache.el ends here +;;; semantic/db-typecache.el ends here diff --git a/lisp/cedet/semantic/db.el b/lisp/cedet/semantic/db.el index dca1b3bafea..c9013ed8c90 100644 --- a/lisp/cedet/semantic/db.el +++ b/lisp/cedet/semantic/db.el @@ -229,7 +229,7 @@ it is in Emacs.") :documentation "List of `semanticdb-table' objects refering to this one. These aren't saved, but are instead recalculated after load. -See the file semanticdb-ref.el for how this slot is used.") +See the file semantic/db-ref.el for how this slot is used.") (pointmax :initarg :pointmax :initform nil :documentation "Size of buffer when written to disk. @@ -441,7 +441,7 @@ Tools needing a per-file cache must subclass this, and then get one as needed. Cache objects are identified in semanticdb by subclass. In order to keep your cache up to date, be sure to implement `semanticdb-synchronize', and `semanticdb-partial-synchronize'. -See the file semantic-scope.el for an example." +See the file semantic/scope.el for an example." :abstract t) (defmethod semanticdb-cache-get ((table semanticdb-abstract-table) @@ -459,7 +459,7 @@ other than :table." (setq cache (cdr cache))) (if obj obj ;; Just return it. - ;; No object, lets create a new one and return that. + ;; No object, let's create a new one and return that. (setq obj (funcall desired-class "Cache" :table table)) (object-add-to-list table 'cache obj) obj))) @@ -492,7 +492,7 @@ Tools needing a database cache must subclass this, and then get one as needed. Cache objects are identified in semanticdb by subclass. In order to keep your cache up to date, be sure to implement `semanticdb-synchronize', and `semanticdb-partial-synchronize'. -See the file semantic-scope.el for an example." +See the file semantic/scope.el for an example." :abstract t) (defmethod semanticdb-cache-get ((db semanticdb-project-database) @@ -510,7 +510,7 @@ other than :table." (setq cache (cdr cache))) (if obj obj ;; Just return it. - ;; No object, lets create a new one and return that. + ;; No object, let's create a new one and return that. (setq obj (funcall desired-class "Cache" :db db)) (object-add-to-list db 'cache obj) obj))) @@ -606,7 +606,7 @@ The file associated with OBJ does not need to be in a buffer." ;; The lexical table should be good too. (when (featurep 'semantic/lex-spp) (oset table lexical-table (semantic-lex-spp-save-table))) - ;; this implies dirtyness + ;; this implies dirtiness (semanticdb-set-dirty table) ;; Synchronize the index @@ -941,7 +941,7 @@ DONTLOAD does not affect the creation of new database objects." (setq fullfile (file-truename file)) ) - ;; If we have a table, but no fullfile, that's ok. Lets get the filename + ;; If we have a table, but no fullfile, that's ok. Let's get the filename ;; from the table which is pre-truenamed. (when (and (not fullfile) tab) (setq fullfile (semanticdb-full-filename tab))) diff --git a/lisp/cedet/semantic/decorate.el b/lisp/cedet/semantic/decorate.el index ee356ad3a9e..4eeac8de141 100644 --- a/lisp/cedet/semantic/decorate.el +++ b/lisp/cedet/semantic/decorate.el @@ -107,7 +107,7 @@ the extent 'intangible' property does not exist." "Hook used in modification hooks to prevent modification. Allows deletion of the entire text. Argument OVERLAY, AFTER, START, END, and LEN are passed in by the system." - ;; Stolen blithly from cpp.el in Emacs 21.1 + ;; Stolen blithely from cpp.el in Emacs 21.1 (if (and (not after) (or (< (semantic-overlay-start overlay) start) (> (semantic-overlay-end overlay) end))) diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el index 0e0a8849d78..766a13023e8 100644 --- a/lisp/cedet/semantic/decorate/include.el +++ b/lisp/cedet/semantic/decorate/include.el @@ -296,7 +296,7 @@ This mode provides a nice context menu on the include statements." ;; Set ourselves up for synchronization (semanticdb-cache-get table 'semantic-decoration-unparsed-include-cache) - ;; Add a dependancy. + ;; Add a dependency. (let ((table semanticdb-current-table)) (semanticdb-add-reference table tag)) ) @@ -459,7 +459,7 @@ to add the path to Semantic's search. If this is an include file that belongs to your project, then you may need to update `semanticdb-project-roots' or better yet, use `ede' to manage your project. See the ede manual for projects that will -wrap existing project code for Semantic's benifit. +wrap existing project code for Semantic's benefit. ") (when (or (eq mm 'c++-mode) (eq mm 'c-mode)) @@ -471,7 +471,7 @@ like this in your .emacs file: (ede-cpp-root-project \"NAME\" :file \"FILENAME\" :locate-fcn 'MYFCN) See the CEDET manual, the EDE manual, or the commentary in -ede-cpp-root.el for more. +ede/cpp-root.el for more. If you think this header tag is marked in error, you may need to do: @@ -739,7 +739,7 @@ any decorated referring includes.") "Refresh any highlighting in buffers referred to by TABLE. If TABLE is not in a buffer, do nothing." ;; This cache removal may seem odd in that we are "creating one", but - ;; since we cant get in the fcn unless one exists, this ought to be + ;; since we can't get in the fcn unless one exists, this ought to be ;; ok. (let ((c (semanticdb-cache-get table 'semantic-decoration-unparsed-include-cache))) diff --git a/lisp/cedet/semantic/doc.el b/lisp/cedet/semantic/doc.el index e5579d09113..ec3b5878c63 100644 --- a/lisp/cedet/semantic/doc.el +++ b/lisp/cedet/semantic/doc.el @@ -56,7 +56,7 @@ If nosnarf if 'lex, then only return the lex token." ;; Check just before the definition. (when (semantic-tag-with-position-p tag) (semantic-documentation-comment-preceeding-tag tag nosnarf)) - ;; Lets look for comments either after the definition, but before code: + ;; Let's look for comments either after the definition, but before code: ;; Not sure yet. Fill in something clever later.... nil)))))) diff --git a/lisp/cedet/semantic/ede-grammar.el b/lisp/cedet/semantic/ede-grammar.el index a4361053174..3a30a931d95 100644 --- a/lisp/cedet/semantic/ede-grammar.el +++ b/lisp/cedet/semantic/ede-grammar.el @@ -71,8 +71,8 @@ parsing different languages.") "@for loadpath in . ${LOADPATH}; do \\" " echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\" "done;" - "@echo \"(require 'semantic-load)\" >> grammar-make-script" - "@echo \"(require 'semantic-grammar)\" >> grammar-make-script" + "@echo \"(require 'semantic/load)\" >> grammar-make-script" + "@echo \"(require 'semantic/grammar)\" >> grammar-make-script" ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script" "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^" ) @@ -101,8 +101,8 @@ parsing different languages.") "@for loadpath in . ${LOADPATH}; do \\" " echo \"(add-to-list 'load-path \\\"$$loadpath\\\")\" >> grammar-make-script; \\" "done;" - "@echo \"(require 'semantic-load)\" >> grammar-make-script" - "@echo \"(require 'semantic-grammar)\" >> grammar-make-script" + "@echo \"(require 'semantic/load)\" >> grammar-make-script" + "@echo \"(require 'semantic/grammar)\" >> grammar-make-script" ;; "@echo \"(setq debug-on-error t)\" >> grammar-make-script" "\"$(EMACS)\" -batch --no-site-file -l grammar-make-script -f semantic-grammar-batch-build-packages $^" ) diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el index 7f7e82a95c2..4ac2733a34f 100644 --- a/lisp/cedet/semantic/edit.el +++ b/lisp/cedet/semantic/edit.el @@ -316,7 +316,7 @@ See `semantic-edits-change-leaf-tag' for details on parents." (setq list-to-search nil))) ;; Search list is nil. )) - ;; If we have a search list, lets go. Otherwise nothing. + ;; If we have a search list, let's go. Otherwise nothing. (while (and list-to-search (not found)) (if (cdr list-to-search) ;; We end when the start of the CDR is after the end of our @@ -427,7 +427,7 @@ See `semantic-edits-change-leaf-tag' for details on parents." ;; which must have a value by now. ;; Loop over the search list to find the preceding CDR. - ;; Fortunatly, (car overlapped-tags) happens to be + ;; Fortunately, (car overlapped-tags) happens to be ;; the first tag positionally. (let ((tokstart (semantic-tag-start (car overlapped-tags)))) (while (and list-to-search @@ -537,7 +537,7 @@ This function is for internal use by `semantic-edits-incremental-parser'." ;; We want to take some set of changes, and group them ;; together into a small change group. One change forces ;; a reparse of a larger region (the size of some set of - ;; tags it encompases.) It may contain several tags. + ;; tags it encompasses.) It may contain several tags. ;; That region may have other changes in it (several small ;; changes in one function, for example.) ;; Optimize for the simple cases here, but try to handle @@ -595,7 +595,7 @@ This function is for internal use by `semantic-edits-incremental-parser'." ;; Feb 06 - ;; IDed when the first cache-list tag is after ;; our change, meaning there is nothing before - ;; the chnge. + ;; the change. ((> (semantic-tag-start (car cache-list)) (semantic-overlay-end (car changes))) (setq last-cond "Beginning of buffer") diff --git a/lisp/cedet/semantic/find.el b/lisp/cedet/semantic/find.el index c62ed818945..b4d94321bc1 100644 --- a/lisp/cedet/semantic/find.el +++ b/lisp/cedet/semantic/find.el @@ -333,7 +333,7 @@ Used in completion." ;;;###autoload (define-overloadable-function semantic-find-tags-by-scope-protection (scopeprotection parent &optional table) - "Find all tags accessable by SCOPEPROTECTION. + "Find all tags accessible by SCOPEPROTECTION. SCOPEPROTECTION is a symbol which can be returned by the method `semantic-tag-protection'. A hard-coded order is used to determine a match. PARENT is a tag representing the PARENT slot needed for @@ -574,7 +574,7 @@ FUNCTION must return non-nil if an element of STREAM will be included in the new list. If optional argument SEARCH-PARTS is non-nil, all sub-parts of tags -are searched. The overloadable function `semantic-tag-componenets' is +are searched. The overloadable function `semantic-tag-components' is used for the searching child lists. If SEARCH-PARTS is the symbol 'positiononly, then only children that have positional information are searched. diff --git a/lisp/cedet/semantic/format.el b/lisp/cedet/semantic/format.el index fa6e7517624..876ec9bbd4a 100644 --- a/lisp/cedet/semantic/format.el +++ b/lisp/cedet/semantic/format.el @@ -291,7 +291,7 @@ local definitions." ;; Try and find a trail of parents from PARENT (let ((rlist (list parent)) ) - ;; IMPLELEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + ;; IMPLEMENT ME!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! (reverse rlist))) (define-overloadable-function semantic-format-tag-canonical-name (tag &optional parent color) @@ -431,7 +431,7 @@ Optional argument COLOR means highlight the prototype with font-lock colors." (doc (semantic-tag-docstring tag buf))) (when (and (not doc) (not buf) fname) ;; If there is no doc, and no buffer, but we have a filename, - ;; lets try again. + ;; let's try again. (save-match-data (setq buf (find-file-noselect fname))) (setq doc (semantic-tag-docstring tag buf))) @@ -603,7 +603,7 @@ This associates a symbol, such as 'public with the st ring \"+\".") "Convert PROTECTION-SYMBOL to a string for UML. By default, uses `semantic-format-tag-protection-symbol-to-string-assoc-list' to convert. -By defaul character returns are: +By default character returns are: public -- + private -- - protected -- #. diff --git a/lisp/cedet/semantic/html.el b/lisp/cedet/semantic/html.el index 80c0a0ddb95..137759d46ac 100644 --- a/lisp/cedet/semantic/html.el +++ b/lisp/cedet/semantic/html.el @@ -61,7 +61,7 @@ (define-mode-local-override semantic-parse-region html-mode (&rest ignore) "Parse the current html buffer for semantic tags. -INGNORE any arguments. Always parse the whole buffer. +IGNORE any arguments. Always parse the whole buffer. Each tag returned is of the form: (\"NAME\" section (:members CHILDREN)) or @@ -222,7 +222,7 @@ tag with greater section value than LEVEL is found." "The children TAG expands to." (semantic-html-components tag)) -;; In semantic-imenu.el, not part of Emacs. +;; In semantic/imenu.el, not part of Emacs. (defvar semantic-imenu-expandable-tag-classes) (defvar semantic-imenu-bucketize-file) (defvar semantic-imenu-bucketize-type-members) diff --git a/lisp/cedet/semantic/ia-sb.el b/lisp/cedet/semantic/ia-sb.el index 57067936a90..95a68673b8c 100644 --- a/lisp/cedet/semantic/ia-sb.el +++ b/lisp/cedet/semantic/ia-sb.el @@ -36,7 +36,7 @@ nil (setq semantic-ia-sb-key-map (speedbar-make-specialized-keymap)) - ;; Basic featuers. + ;; Basic features. (define-key semantic-ia-sb-key-map "\C-m" 'speedbar-edit-line) (define-key semantic-ia-sb-key-map "I" 'semantic-ia-sb-show-tag-info) ) diff --git a/lisp/cedet/semantic/ia.el b/lisp/cedet/semantic/ia.el index 69b1dba0bcf..2aae39d4b21 100644 --- a/lisp/cedet/semantic/ia.el +++ b/lisp/cedet/semantic/ia.el @@ -115,11 +115,11 @@ Completion options are calculated with `semantic-analyze-possible-completions'." (if (null syms) (if (semantic-analyze-context-p a) ;; This is a clever hack. If we were unable to find any - ;; smart completions, lets divert to how senator derives + ;; smart completions, let's divert to how senator derives ;; completions. ;; ;; This is a way of making this fcn more useful since - ;; the smart completion engine sometimes failes. + ;; the smart completion engine sometimes fails. (semantic-complete-symbol)) ;; Use try completion to seek a common substring. (let ((tc (try-completion (or pre "") syms))) @@ -199,7 +199,7 @@ Completion options are calculated with `semantic-analyze-possible-completions'." ) (if pf (message "%s" (semantic-format-tag-summarize pf nil t)) - (message "No summary info availalble")))) + (message "No summary info available")))) ;;; Variants ;; @@ -245,14 +245,14 @@ Completion options are calculated with `semantic-analyze-possible-completions'." ;; Jump to a destination based on the local context. ;; ;; This shows how to use the analyzer context, and the -;; analyer references objects to choose a good destination. +;; analyzer references objects to choose a good destination. (defun semantic-ia--fast-jump-helper (dest) "Jump to DEST, a Semantic tag. This helper manages the mark, buffer switching, and pulsing." ;; We have a tag, but in C++, we usually get a prototype instead - ;; because of header files. Lets try to find the actual - ;; implementaion instead. + ;; because of header files. Let's try to find the actual + ;; implementation instead. (when (semantic-tag-prototype-p dest) (let* ((refs (semantic-analyze-tag-references dest)) (impl (semantic-analyze-refs-impl refs t)) diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el index f17a5471d75..b49d1db1ad5 100644 --- a/lisp/cedet/semantic/idle.el +++ b/lisp/cedet/semantic/idle.el @@ -427,7 +427,7 @@ datasets." (defun semantic-idle-scheduler-work-parse-neighboring-files () "Parse all the files in similar directories to buffers being edited." - ;; Lets check to see if EDE matters. + ;; Let's check to see if EDE matters. (let ((ede-auto-add-method 'never)) (dolist (a auto-mode-alist) (when (eq (cdr a) major-mode) @@ -1314,4 +1314,4 @@ mouse-3: popup context menu" ;; generated-autoload-load-name: "semantic/idle" ;; End: -;;; semantic-idle.el ends here +;;; semantic/idle.el ends here diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index e7e1da55ce3..033c34e1b83 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -96,7 +96,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil." (defcustom semantic-imenu-bucketize-type-members t "*Non-nil if members of a type should be grouped into buckets. A nil value means to keep them in the same order. -Overriden to nil if `semantic-imenu-bucketize-file' is nil." +Overridden to nil if `semantic-imenu-bucketize-file' is nil." :group 'semantic-imenu :type 'boolean) (make-variable-buffer-local 'semantic-imenu-bucketize-type-members) @@ -393,7 +393,7 @@ Optional argument PARENT is a tag parent of STREAM." semantic-imenu-bucketize-file) (semantic-create-imenu-index-1 parts tag) (semantic-create-imenu-subindex parts)))) - ;; Only add a *definition* if we have a postion + ;; Only add a *definition* if we have a position ;; in that type tag. (if (semantic-tag-with-position-p tag) (cons diff --git a/lisp/cedet/semantic/java.el b/lisp/cedet/semantic/java.el index 71a205386db..c3075634242 100644 --- a/lisp/cedet/semantic/java.el +++ b/lisp/cedet/semantic/java.el @@ -256,7 +256,7 @@ Optional argument COLOR indicates that color should be mixed in." (define-mode-local-override semantic-documentation-for-tag java-mode (&optional tag nosnarf) "Find documentation from TAG and return it as a clean string. -Java has documentation set in a comment preceding TAG's definition. +Java have documentation set in a comment preceding TAG's definition. Attempt to strip out comment syntactic sugar, unless optional argument NOSNARF is non-nil. If NOSNARF is 'lex, then return the semantic lex token." diff --git a/lisp/cedet/semantic/lex-spp.el b/lisp/cedet/semantic/lex-spp.el index de4cb7a9c62..8009a257a7b 100644 --- a/lisp/cedet/semantic/lex-spp.el +++ b/lisp/cedet/semantic/lex-spp.el @@ -1,4 +1,4 @@ -;;; lex-spp.el --- Semantic Lexical Pre-processor +;;; semantic/lex-spp.el --- Semantic Lexical Pre-processor ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. @@ -639,7 +639,7 @@ and what valid VAL values are." ;;; Macro Merging ;; -;; Used when token streams from different macros include eachother. +;; Used when token streams from different macros include each other. ;; Merged macro streams perform in place replacements. (defun semantic-lex-spp-merge-streams (raw-stream) @@ -709,7 +709,7 @@ ARGVALUES are values for any arg list, or nil." ;;; Symbol Is Macro ;; -;; An analyser that will push tokens from a macro in place +;; An analyzer that will push tokens from a macro in place ;; of the macro symbol. ;; (defun semantic-lex-spp-anlyzer-do-replace (sym val beg end) @@ -1230,4 +1230,4 @@ If BUFFER is not provided, use the current buffer." ;; generated-autoload-load-name: "semantic/lex-spp" ;; End: -;;; semantic-lex-spp.el ends here +;;; semantic/lex-spp.el ends here diff --git a/lisp/cedet/semantic/lex.el b/lisp/cedet/semantic/lex.el index d6b8e1a8bf5..4da3be98f37 100644 --- a/lisp/cedet/semantic/lex.el +++ b/lisp/cedet/semantic/lex.el @@ -491,7 +491,7 @@ For compatibility with Semantic 1.x it defaults to `semantic-flex'.") (symbol) (whitespace) ) - "An alist of of semantic token types. + "An alist of semantic token types. As of December 2001 (semantic 1.4beta13), this variable is not used in any code. The only use is to refer to the doc-string from elsewhere. @@ -1437,7 +1437,7 @@ Return either a paren token or a semantic list token depending on ;;; Comment lexer ;; ;; Predefined lexers that could be used instead of creating new -;; analyers. +;; analyzers. (define-lex semantic-comment-lexer "A simple lexical analyzer that handles comments. @@ -1677,7 +1677,7 @@ When the lexer encounters the open-paren delimiter \"(\": ;;; Lexical Safety ;; ;; The semantic lexers, unlike other lexers, can throw errors on -;; unbalanced syntax. Since editing is all about changeging test +;; unbalanced syntax. Since editing is all about changing text ;; we need to provide a convenient way to protect against syntactic ;; inequalities. @@ -1758,7 +1758,7 @@ If there is no error, then the last value of FORMS is returned." (semantic-alias-obsolete 'semantic-flex-map-keywords 'semantic-lex-map-keywords "23.2") (semantic-alias-obsolete 'semantic-flex-keywords 'semantic-lex-keywords "23.2") (semantic-alias-obsolete 'semantic-flex-buffer 'semantic-lex-buffer "23.2") -(semantic-alias-obsolete 'semantic-flex-list 'semantic-lex-list "23.2") +(semantic-alias-obsolete 'semantic-flex-list 'semantic-lex-list "23.2") ;; This simple scanner uses the syntax table to generate a stream of ;; simple tokens of the form: @@ -1769,7 +1769,7 @@ If there is no error, then the last value of FORMS is returned." ;; objects boundary. (defvar semantic-flex-tokens semantic-lex-tokens - "An alist of of semantic token types. + "An alist of semantic token types. See variable `semantic-lex-tokens'.") (defvar semantic-flex-unterminated-syntax-end-function diff --git a/lisp/cedet/semantic/sb.el b/lisp/cedet/semantic/sb.el index 88b0cc33d43..d9a3ede360d 100644 --- a/lisp/cedet/semantic/sb.el +++ b/lisp/cedet/semantic/sb.el @@ -313,7 +313,7 @@ TEXT TOKEN and INDENT are the details." (save-excursion (speedbar-stealthy-updates)) (semantic-go-to-tag token parent) (switch-to-buffer (current-buffer)) - ;; Reset the timer with a new timeout when cliking a file + ;; Reset the timer with a new timeout when clicking a file ;; in case the user was navigating directories, we can cancel ;; that other timer. ;; (speedbar-set-timer dframe-update-speed) @@ -399,7 +399,7 @@ Returns the tag list, or t for an error." (if (listp out) (condition-case nil (progn - ;; This brings externally defind methods into + ;; This brings externally defined methods into ;; their classes, and creates meta classes for ;; orphans. (setq out (semantic-adopt-external-members out)) diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el index 78a1fd049f0..16deb245527 100644 --- a/lisp/cedet/semantic/scope.el +++ b/lisp/cedet/semantic/scope.el @@ -186,7 +186,7 @@ Use `semantic-ctxt-scoped-types' to find types." (save-excursion (goto-char position) (let ((code-scoped-types nil)) - ;; Lets ask if any types are currently scoped. Scoped + ;; Let's ask if any types are currently scoped. Scoped ;; classes and types provide their public methods and types ;; in source code, but are unrelated hierarchically. (let ((sp (semantic-ctxt-scoped-types))) @@ -249,7 +249,7 @@ are from nesting data types." ;; Analyze the stack of tags we are nested in as parents. ;; - ;; If we have a pparent tag, lets go there + ;; If we have a pparent tag, let's go there ;; an analyze that stack of tags. (when (and pparent (semantic-tag-with-position-p pparent)) (semantic-go-to-tag pparent) @@ -384,7 +384,7 @@ be found." ;;------------------------------------------------------------ (define-overloadable-function semantic-analyze-scoped-tags (typelist parentlist) - "Return accessable tags when TYPELIST and PARENTLIST is in scope. + "Return accessible tags when TYPELIST and PARENTLIST is in scope. Tags returned are not in the global name space, but are instead scoped inside a class or namespace. Such items can be referenced without use of \"object.function()\" style syntax due to an @@ -412,7 +412,7 @@ implicit \"object\"." )) (setq typelist (cdr typelist))) - ;; Loop over the types (which should be sorted by postion + ;; Loop over the types (which should be sorted by position) ;; adding to the scopelist as we go, and using the scopelist ;; for additional searching! (while typelist2 @@ -424,9 +424,9 @@ implicit \"object\"." currentscope)) (setq typelist2 (cdr typelist2))) - ;; Collect all the types (class, etc) that are in our heratage. + ;; Collect all the types (class, etc) that are in our heritage. ;; These are types that we can extract members from, not those - ;; delclared in using statements, or the like. + ;; declared in using statements, or the like. ;; Get the PARENTS including nesting scope for this location. (while parentlist (oset miniscope scope currentscope) diff --git a/lisp/cedet/semantic/sort.el b/lisp/cedet/semantic/sort.el index d62c3bb17d9..c3d8b26810c 100644 --- a/lisp/cedet/semantic/sort.el +++ b/lisp/cedet/semantic/sort.el @@ -1,4 +1,4 @@ -;;; sort.el --- Utilities for sorting and re-arranging tag tables. +;;; semantic/sort.el --- Utilities for sorting and re-arranging tag tables. ;;; Copyright (C) 1999-2005, 2007-2011 Free Software Foundation, Inc. @@ -27,7 +27,7 @@ ;; purposes. Re-organization may be alphabetical, or even a complete ;; reorganization of parents and children. ;; -;; Originally written in semantic-util.el +;; Originally written in semantic/util.el ;; (require 'semantic) @@ -565,4 +565,4 @@ See `semantic-tag-external-class' for details." ;; generated-autoload-load-name: "semantic/sort" ;; End: -;;; semantic-sort.el ends here +;;; semantic/sort.el ends here diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el index 1571622b29a..da250e66bb5 100644 --- a/lisp/cedet/semantic/symref/grep.el +++ b/lisp/cedet/semantic/symref/grep.el @@ -102,7 +102,7 @@ ROOTDIR is the root location to run the `find' from. FILEPATTERN is a string representing find flags for searching file patterns. GREPFLAGS are flags passed to grep, such as -n or -l. GREPPATTERN is the pattern used by grep." - ;; We have grep-compute-defaults. Lets use it. + ;; We have grep-compute-defaults. Let's use it. (grep-compute-defaults) (let* ((grep-expand-keywords semantic-symref-grep-expand-keywords) (cmd (grep-expand-template grep-find-template diff --git a/lisp/cedet/semantic/tag-file.el b/lisp/cedet/semantic/tag-file.el index 17fd3b45356..d118d9b6203 100644 --- a/lisp/cedet/semantic/tag-file.el +++ b/lisp/cedet/semantic/tag-file.el @@ -154,7 +154,7 @@ Depends on `semantic-dependency-include-path' for searching. Always searches (setq result ;; I don't have a plan for refreshing tags with a dependency ;; stuck on them somehow. I'm thinking that putting a cache - ;; onto the dependancy finding with a hash table might be best. + ;; onto the dependency finding with a hash table might be best. ;;(if (semantic--tag-get-property tag 'dependency-file) ;; (semantic--tag-get-property tag 'dependency-file) (:override diff --git a/lisp/cedet/semantic/tag-ls.el b/lisp/cedet/semantic/tag-ls.el index 8f54698d506..4d001322108 100644 --- a/lisp/cedet/semantic/tag-ls.el +++ b/lisp/cedet/semantic/tag-ls.el @@ -41,7 +41,7 @@ (define-overloadable-function semantic-tag-calculate-parent (tag) "Attempt to calculate the parent of TAG. -The default behavior (if not overriden with `tag-calculate-parent') +The default behavior (if not overridden with `tag-calculate-parent') is to search a buffer found with TAG, and if externally defined, search locally, then semanticdb for that tag (when enabled.)") @@ -98,7 +98,7 @@ See `semantic-tag-protection'." prot)) (defun semantic-tag-protected-p (tag protection &optional parent) - "Non-nil if TAG is is protected. + "Non-nil if TAG is protected. PROTECTION is a symbol which can be returned by the method `semantic-tag-protection'. PARENT is the parent data type which contains TAG. @@ -106,7 +106,7 @@ PARENT is the parent data type which contains TAG. For these PROTECTIONs, true is returned if TAG is: @table @asis @item nil - Always true + Always true. @item private True if nil. @item protected @@ -221,7 +221,7 @@ something without an implementation." (define-overloadable-function semantic-tag-full-name (tag &optional stream-or-buffer) "Return the fully qualified name of TAG in the package hierarchy. -STREAM-OR-BUFFER can be anything convertable by `semantic-something-to-stream', +STREAM-OR-BUFFER can be anything convertible by `semantic-something-to-stream', but must be a toplevel semantic tag stream that contains TAG. A Package Hierarchy is defined in UML by the way classes and methods are organized on disk. Some language use this concept such that a diff --git a/lisp/cedet/semantic/texi.el b/lisp/cedet/semantic/texi.el index 66327cbe2ff..c2f080ce75b 100644 --- a/lisp/cedet/semantic/texi.el +++ b/lisp/cedet/semantic/texi.el @@ -421,7 +421,7 @@ Optional argument POINT is where to look for the environment." texinfo-mode (context) "List smart completions at point. Since texinfo is not a programming language the default version is not -useful. Insted, look at the current symbol. If it is a command +useful. Instead, look at the current symbol. If it is a command do primitive texinfo built ins. If not, use ispell to lookup words that start with that symbol." (let ((prefix (car (oref context :prefix))) @@ -446,7 +446,7 @@ that start with that symbol." ;;; Parser Setup ;; -;; In semantic-imenu.el, not part of Emacs. +;; In semantic/imenu.el, not part of Emacs. (defvar semantic-imenu-expandable-tag-classes) (defvar semantic-imenu-bucketize-file) (defvar semantic-imenu-bucketize-type-members) @@ -579,7 +579,7 @@ Note: TYPE not yet implemented." ;; (setq doctag (if docstring sourcetag nil)))) ;; (setq tags (cdr tags))))) ;; ;; If we found a prototype of the function that has some doc, but not the -;; ;; actual function, lets make due with that. +;; ;; actual function, let's make due with that. ;; (if (not docstring) ;; (cond ((stringp docstringvar) ;; (setq docstring docstringvar @@ -592,12 +592,12 @@ Note: TYPE not yet implemented." ;; (error "Could not find documentation for %s" (semantic-tag-name tag))) ;; ;; (require 'srecode) -;; (require 'srecode-texi) +;; (require 'srecode/texi) ;; ;; ;; If we have a string, do the replacement. ;; (delete-region (semantic-tag-start tag) ;; (semantic-tag-end tag)) -;; ;; Use useful functions from the docaument library. +;; ;; Use useful functions from the document library. ;; (srecode-texi-insert-tag-as-doc doctag) ;; ;(semantic-insert-foreign-tag doctag) ;; )) diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el index d0647d8e271..f3d11d38512 100644 --- a/lisp/cedet/semantic/wisent/java-tags.el +++ b/lisp/cedet/semantic/wisent/java-tags.el @@ -77,7 +77,7 @@ This function override `get-local-variables'." ;;;; Semantic integration of the Java LALR parser ;;;; -;; In semantic-imenu.el, not part of Emacs. +;; In semantic/imenu.el, not part of Emacs. (defvar semantic-imenu-summary-function) ;;;###autoload diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el index 095a817f08d..1f52e9eb3b6 100644 --- a/lisp/cedet/semantic/wisent/python.el +++ b/lisp/cedet/semantic/wisent/python.el @@ -108,7 +108,7 @@ line ends at the end of the buffer, leave the point there." (defun wisent-python-forward-line-skip-indented () "Move point to the next logical line, skipping indented lines. That is the next line whose indentation is less than or equal to the -identation of the current line." +indentation of the current line." (let ((indent (current-indentation))) (while (progn (wisent-python-forward-line) (and (not (eobp)) @@ -291,7 +291,7 @@ To be implemented for Python! For now just return nil." ;; Character used to separation a parent/child relationship semantic-type-relation-separator-character '(".") semantic-command-separation-character ";" - ;; The following is no more necessary as semantic-lex is overriden + ;; The following is no more necessary as semantic-lex is overridden ;; in python-mode. ;; semantic-lex-analyzer 'wisent-python-lexer diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el index 7b499d1a5e7..5527273a3a5 100644 --- a/lisp/cedet/srecode.el +++ b/lisp/cedet/srecode.el @@ -31,7 +31,7 @@ ;; ;; Contemplation of the simplistic problem within the scope of ;; semantic showed that the solution was more complex than could -;; possibly be handled in semantic-format.el. Semantic Recode, or +;; possibly be handled in semantic/format.el. Semantic Recode, or ;; srecode is a rich API for generating code out of semantic tags, or ;; recoding the tags. ;; diff --git a/lisp/cedet/srecode/compile.el b/lisp/cedet/srecode/compile.el index 0a117bad9bc..d3623d6022f 100644 --- a/lisp/cedet/srecode/compile.el +++ b/lisp/cedet/srecode/compile.el @@ -62,11 +62,11 @@ (dictionary :initarg :dictionary :type (or null srecode-dictionary) :documentation - "List of section dictinaries. + "List of section dictionaries. The compiled template can contain lists of section dictionaries, or values that are expected to be passed down into different section macros. The template section dictionaries are merged in with -any incomming dictionaries values.") +any incoming dictionaries values.") (binding :initarg :binding :documentation "Preferred keybinding for this template in `srecode-minor-mode-map'.") @@ -103,7 +103,7 @@ stack is broken." ;; work, and the smaller, simple inserter object is saved in ;; the compiled templates. ;; -;; See srecode-insert.el for the specialized classes. +;; See srecode/insert.el for the specialized classes. ;; (defclass srecode-template-inserter (eieio-named) ((secondname :initarg :secondname @@ -552,7 +552,7 @@ A list of defined variables VARS provides a variable table." (when (not hs) (setq hs (make-hash-table :test 'equal :size 20)) (puthash context hs contexthash)) - ;; Put into that contenxt's hash. + ;; Put into that context's hash. (puthash objname (car lp) hs) ) diff --git a/lisp/cedet/srecode/ctxt.el b/lisp/cedet/srecode/ctxt.el index cae52428e75..f392379347a 100644 --- a/lisp/cedet/srecode/ctxt.el +++ b/lisp/cedet/srecode/ctxt.el @@ -73,7 +73,7 @@ Some useful context values used by the provided srecode templates are: ) (defun srecode-calculate-nearby-things () - ;; NOTE: May need to add bounes to this FCN + ;; NOTE: May need to add bounds to this FCN "Calculate the CONTEXT type items nearby the current point. Assume that what we want to insert next is based on what is just before point. If there is nothing, then assume it is whatever is diff --git a/lisp/cedet/srecode/dictionary.el b/lisp/cedet/srecode/dictionary.el index 06496160b8c..62ceff82448 100644 --- a/lisp/cedet/srecode/dictionary.el +++ b/lisp/cedet/srecode/dictionary.el @@ -1,4 +1,4 @@ -;;; srecode-dictionary.el --- Dictionary code for the semantic recoder. +;;; srecode/dictionary.el --- Dictionary code for the semantic recoder. ;; Copyright (C) 2007-2011 Free Software Foundation, Inc. @@ -202,7 +202,7 @@ associated with a buffer or parent." :size 20) :origin origin))) ;; Only set up the default variables if we are being built - ;; directroy for a particular buffer. + ;; directly for a particular buffer. (when initfrombuff ;; Variables from the table we are inserting from. ;; @todo - get a better tree of tables. @@ -280,7 +280,7 @@ inserted dictionaries." (progn (srecode-dictionary-show-section new "FIRST") (srecode-dictionary-show-section new "LAST")) - ;; Not the very first one. Lets clean up CAR. + ;; Not the very first one. Let's clean up CAR. (let ((tail (car (last ov)))) (srecode-dictionary-hide-section tail "LAST") (srecode-dictionary-show-section tail "NOTLAST") @@ -436,7 +436,7 @@ The root dictionary is usually for a current or active insertion." ;;; COMPOUND VALUE METHODS ;; -;; Compound values must provide at least the toStriong method +;; Compound values must provide at least the toString method ;; for use in converting the compound value into sometehing insertable. (defmethod srecode-compound-toString ((cp srecode-dictionary-compound-value) diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el index bccc85fb82b..caf1ddebdb2 100644 --- a/lisp/cedet/srecode/document.el +++ b/lisp/cedet/srecode/document.el @@ -37,7 +37,7 @@ ;; Document has now been ported to srecode, using the semantic recoder ;; as the templating engine. -;; This file combines srecode-document.el and srecode-document-vars.el +;; This file combines srecode/document.el and srecode/document-vars.el ;; from the CEDET repository. (require 'srecode/args) @@ -167,7 +167,7 @@ doesn't always work correctly." ("str\\(ing\\)?" . "string") ("use?r" . "user") ("num\\(ber\\)?" . "number") - ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;commen sylable + ("\\(^\\|\\s-\\)id\\($\\|\\s-\\)" . "Identifier") ;complex cause ;common sylable ) "List of common English abbreviations or full words. These are nouns (as opposed to verbs) for use in creating expanded @@ -720,7 +720,7 @@ allocating something based on its type." "Convert tag or string PARAM into a name,comment pair. Optional COMMENTLIST is list of previously existing comments to use instead in alist form. If the name doesn't appear in the list of -standard names, then englishify it instead." +standard names, then english it instead." (let ((cmt "") (aso srecode-document-autocomment-param-alist) (fnd nil) @@ -811,8 +811,8 @@ not account for verb parts." (if (string-match (car (car al)) (downcase ts)) (progn (setq newstr (concat newstr (cdr (car al)))) - ;; don't terminate because we may actuall have 2 words - ;; next to eachother we didn't identify before + ;; don't terminate because we may actually have 2 words + ;; next to each other we didn't identify before (setq llow t))) (setq al (cdr al))) (if (not llow) (setq newstr (concat newstr ts))) diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el index dba4b876edb..d87dc315829 100644 --- a/lisp/cedet/srecode/extract.el +++ b/lisp/cedet/srecode/extract.el @@ -61,12 +61,12 @@ (oset st lastdict dict)) (defmethod srecode-extract-state-set-anchor ((st srecode-extract-state)) - "Reset the achor point on extract state ST." + "Reset the anchor point on extract state ST." (oset st anchor (point))) (defmethod srecode-extract-state-extract ((st srecode-extract-state) endpoint) - "Perform an extraction on the extract state ST with ENDPOITNT. + "Perform an extraction on the extract state ST with ENDPOINT. If there was no waiting inserter, do nothing." (when (oref st lastinserter) (save-match-data diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 088781cfb53..f13fb17ca8f 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -101,7 +101,7 @@ Has virtual :start and :end initializers.") )) ;; Create a temporary overlay now. We have to use an overlay and - ;; not a marker becaues of the in-front insertion rules. The rules + ;; not a marker because of the in-front insertion rules. The rules ;; are backward from what is wanted while typing. (setq olay (make-overlay start end (current-buffer) t nil)) (overlay-put olay 'srecode-init-only t) @@ -338,7 +338,7 @@ PRE-LEN is used in the after mode for the length of the changed text." (inhibit-modification-hooks t) ) ;; Sometimes a field is deleted, but we might still get a stray - ;; event. Lets just ignore those events. + ;; event. Let's just ignore those events. (when (slot-boundp field 'overlay) ;; First, fixup the two overlays, in case they got confused. (let ((main (oref field overlay)) diff --git a/lisp/cedet/srecode/find.el b/lisp/cedet/srecode/find.el index fdca64a7da1..d9765ebd449 100644 --- a/lisp/cedet/srecode/find.el +++ b/lisp/cedet/srecode/find.el @@ -103,7 +103,7 @@ If TAB is nil, then always return t." (let ((proj (oref tab :project))) ;; Return t if the project wasn't set. (if (not proj) t - ;; If the project directory was set, lets check it. + ;; If the project directory was set, let's check it. (let ((dd (expand-file-name default-directory)) (projexp (regexp-quote (directory-file-name proj)))) (if (string-match (concat "^" projexp) dd) diff --git a/lisp/cedet/srecode/getset.el b/lisp/cedet/srecode/getset.el index a582d4ff59e..9a6c27dcd73 100644 --- a/lisp/cedet/srecode/getset.el +++ b/lisp/cedet/srecode/getset.el @@ -215,7 +215,7 @@ INCLASS specifies if the cursor is already in CLASS or not." (when (not te) (message "Unknown location for tag-end in %s:" (semantic-tag-name aftertag))) (goto-char te) - ;; If there is a comment immediatly after aftertag, skip over it. + ;; If there is a comment immediately after aftertag, skip over it. (when (looking-at (concat "\\s-*\n?\\s-*" semantic-lex-comment-regex)) (let ((pos (point)) (rnext (semantic-find-tag-by-overlay-next (point)))) diff --git a/lisp/cedet/srecode/insert.el b/lisp/cedet/srecode/insert.el index 931d0b3d73e..9fbfc5dc042 100644 --- a/lisp/cedet/srecode/insert.el +++ b/lisp/cedet/srecode/insert.el @@ -1,4 +1,4 @@ -;;; srecode/insert --- Insert srecode templates to an output stream. +;;; srecode/insert.el --- Insert srecode templates to an output stream. ;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc. @@ -255,7 +255,7 @@ ST can be a class, or an object." (let ((c (oref st code))) (srecode-push st) (srecode-insert-code-stream c dictionary)) - ;; Poping the stack is protected + ;; Popping the stack is protected. (srecode-pop st))) (defun srecode-insert-code-stream (code dictionary) @@ -911,7 +911,7 @@ this template instance." (setq active (cdr active))) (when (not tmpl) ;; If it wasn't in this context, look to see if it - ;; defines it's own context + ;; defines its own context (setq tmpl (srecode-template-get-table (srecode-table) templatenamepart))) ) @@ -936,7 +936,7 @@ with the dictionaries found in the dictionary." (if (srecode-dictionary-lookup-name dictionary (oref sti :object-name)) ;; If we have a value, then call the next method (srecode-insert-method-helper sti dictionary 'includedtemplate) - ;; If we don't have a special dictitonary, then just insert with the + ;; If we don't have a special dictionary, then just insert with the ;; current dictionary. (srecode-insert-subtemplate sti dictionary 'includedtemplate)) ) diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el index 69534e053f1..4e76c15e300 100644 --- a/lisp/cedet/srecode/java.el +++ b/lisp/cedet/srecode/java.el @@ -1,4 +1,4 @@ -;;; srecode-java.el --- Srecode Java support +;;; srecode/java.el --- Srecode Java support ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. diff --git a/lisp/cedet/srecode/mode.el b/lisp/cedet/srecode/mode.el index 6ca0cefe9a7..23d09bc9a4b 100644 --- a/lisp/cedet/srecode/mode.el +++ b/lisp/cedet/srecode/mode.el @@ -61,7 +61,7 @@ (define-key km (format "%c" k) 'srecode-bind-insert) (setq k (1+ k)))) km) - "Keymap used behind the srecode prefix key in in srecode minor mode.") + "Keymap used behind the srecode prefix key in srecode minor mode.") (defvar srecode-menu-bar (list @@ -366,7 +366,7 @@ programming modes." (define-key srecode-prefix-map oldkey nil) ))) - ;; Update Keybings + ;; Update Keybindings (let ((oldbinding (lookup-key srecode-prefix-map binding))) ;; During development, allow overrides. diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el index 4a1a15c1d12..956bdfbd97a 100644 --- a/lisp/cedet/srecode/semantic.el +++ b/lisp/cedet/srecode/semantic.el @@ -394,7 +394,7 @@ as `function' will leave point where code might be inserted." (srecode-semantic-apply-tag-to-dict tagobj dict))) ;; Insert dict-entries into the dictionary LAST so that previous - ;; items can be overriden. + ;; items can be overridden. (let ((entries dict-entries)) (while entries (srecode-dictionary-set-value dict diff --git a/lisp/cedet/srecode/srt-mode.el b/lisp/cedet/srecode/srt-mode.el index 5a407aad135..0a99b7869e8 100644 --- a/lisp/cedet/srecode/srt-mode.el +++ b/lisp/cedet/srecode/srt-mode.el @@ -483,7 +483,7 @@ section or ? for an ask variable." (if (> start (point)) ;; If our starting point is after the found point, that - ;; means we are not inside the macro. Retur nil. + ;; means we are not inside the macro. Return nil. nil ;; We are inside the macro, extract the text so far. (let* ((macroend (match-beginning 0)) diff --git a/lisp/cedet/srecode/template.el b/lisp/cedet/srecode/template.el index e0cf42b75df..5dd32a85786 100644 --- a/lisp/cedet/srecode/template.el +++ b/lisp/cedet/srecode/template.el @@ -1,4 +1,4 @@ -;;; srecode-template.el --- SRecoder template language parser support. +;;; srecode/template.el --- SRecoder template language parser support. ;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc. diff --git a/lisp/cedet/srecode/texi.el b/lisp/cedet/srecode/texi.el index 38d8e765d41..acfc2486711 100644 --- a/lisp/cedet/srecode/texi.el +++ b/lisp/cedet/srecode/texi.el @@ -1,4 +1,4 @@ -;;; srecode-texi.el --- Srecode texinfo support. +;;; srecode/texi.el --- Srecode texinfo support. ;; Copyright (C) 2008-2011 Free Software Foundation, Inc. @@ -231,7 +231,7 @@ This is to take advantage of TeXinfo's markup symbols." (if buffer (progn (set-buffer buffer) (srecode-texi-texify-docstring string)) - ;; Else, no buffer, so lets do something else + ;; Else, no buffer, so let's do something else (with-mode-local texinfo-mode (srecode-texi-texify-docstring string))))) diff --git a/lisp/comint.el b/lisp/comint.el index b91b82adb21..f25293ff3ac 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -3442,7 +3442,7 @@ Also print a message when redirection is completed." :group 'comint :type 'boolean) -;; Directly analagous to comint-preoutput-filter-functions +;; Directly analogous to comint-preoutput-filter-functions (defvar comint-redirect-filter-functions nil "List of functions to call before inserting redirected process output. Each function gets one argument, a string containing the text received diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 3760a7a9d74..1d6b42f48e6 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -400,8 +400,8 @@ since it could result in memory overflow and make Emacs crash." (const :tag "Never (nil)" :value nil) (const :tag "Only on ttys" :value tty) (other :tag "Always" t)) "23.1") - (window-splits windows boolean "24.1") - (window-nest windows boolean "24.1") + (window-combination-resize windows boolean "24.1") + (window-combination-limit windows boolean "24.1") ;; xdisp.c (show-trailing-whitespace whitespace-faces boolean nil :safe booleanp) diff --git a/lisp/delim-col.el b/lisp/delim-col.el index d9f8634fb54..ed6ab96107a 100644 --- a/lisp/delim-col.el +++ b/lisp/delim-col.el @@ -194,7 +194,7 @@ Any other value is treated as t." :tag "Column Formating" (const :tag "No Formating" nil) (const :tag "Column Alignment" t) - (const :tag "Separator Aligment" separator) + (const :tag "Separator Alignment" separator) (const :tag "Column Padding" padding)) :group 'columns) diff --git a/lisp/desktop.el b/lisp/desktop.el index cdc787dfde9..8a61bec0eea 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -4,7 +4,7 @@ ;; Author: Morten Welinder <terra@diku.dk> ;; Keywords: convenience -;; Favourite-brand-of-beer: None, I hate beer. +;; Favorite-brand-of-beer: None, I hate beer. ;; This file is part of GNU Emacs. @@ -1176,7 +1176,7 @@ directory DIRNAME." (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count)) (setq result nil)) ;; Restore buffer list order with new buffer at end. Don't change - ;; the order for old desktop files (old desktop module behaviour). + ;; the order for old desktop files (old desktop module behavior). (unless (< desktop-file-version 206) (mapc 'bury-buffer buffer-list) (when result (bury-buffer result))) diff --git a/lisp/dframe.el b/lisp/dframe.el index 02eeef064fe..93d9e7948cf 100644 --- a/lisp/dframe.el +++ b/lisp/dframe.el @@ -523,7 +523,7 @@ LOCATION can be one of 'random, 'left-right, or 'top-bottom." (funcall f 'default frame))))) (defun dframe-detach (frame-var cache-var buffer-var) - "Detatch the frame in symbol FRAME-VAR. + "Detach the frame in symbol FRAME-VAR. CACHE-VAR and BUFFER-VAR are symbols as in `dframe-frame-mode'" (with-current-buffer (symbol-value buffer-var) (rename-buffer (buffer-name) t) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index b09096978fd..b63940cec2d 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -347,7 +347,7 @@ This calls touch." ;; Do the operation and record failures. failures (nconc (apply function (append args pending)) failures) - ;; Transfer the elemens of PENDING onto PAST + ;; Transfer the elements of PENDING onto PAST ;; and clear it out. Now PAST contains the first N files ;; specified (for some N), and FILES contains the rest. past (nconc past pending) @@ -1490,7 +1490,7 @@ ARG as in `dired-get-marked-files'. Optional arg MARKER-CHAR as in `dired-create-files'. Optional arg OP1 is an alternate form for OPERATION if there is only one file. -Optional arg HOW-TO determiness how to treat the target. +Optional arg HOW-TO determines how to treat the target. If HOW-TO is nil, use `file-directory-p' to determine if the target is a directory. If so, the marked file(s) are created inside that directory. Otherwise, the target is a plain file; diff --git a/lisp/dired.el b/lisp/dired.el index 4e03d61a06e..e88ebc83b33 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -1025,7 +1025,7 @@ BEG..END is the line where the file info is located." ;; spaces there (and within the filename as well, of course). (save-excursion (let (file file-col other other-col) - ;; Check that there is indeed a file, and that there is anoter adjacent + ;; Check that there is indeed a file, and that there is another adjacent ;; file with which to align, and that additional spaces are needed to ;; align the filenames. (when (and (setq file (progn (goto-char beg) @@ -3667,7 +3667,7 @@ Ask means pop up a menu for the user to select one of copy, move or link." ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "0ffe89ae728efb341dfacff6c85e2ba4") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "2026ac587f0d9e893bae7662ff9d9318") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ diff --git a/lisp/electric.el b/lisp/electric.el index 26fba20ea12..69acb773648 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -197,7 +197,11 @@ Returns nil when we can't find this char." ;; value, which only works well if the variable is preloaded. ;;;###autoload (defvar electric-indent-chars '(?\n) - "Characters that should cause automatic reindentation.") + "Characters that should cause automatic reindentation. +Each entry of the list can be either a character or a cons of the +form (CHAR . PREDICATE) which means that CHAR should cause reindentation +only if PREDICATE returns non-nil. PREDICATE is called with no arguments +and with point before the inserted char.") (defun electric-indent-post-self-insert-function () ;; FIXME: This reindents the current line, but what we really want instead is @@ -208,7 +212,12 @@ Returns nil when we can't find this char." ;; There might be a way to get it working by analyzing buffer-undo-list, but ;; it looks challenging. (let (pos) - (when (and (memq last-command-event electric-indent-chars) + (when (and (or (memq last-command-event electric-indent-chars) + (let ((cp (assq last-command-event electric-indent-chars))) + (and cp (setq pos (electric--after-char-pos)) + (save-excursion + (goto-char (1- pos)) + (funcall (cdr cp)))))) ;; Don't reindent while inserting spaces at beginning of line. (or (not (memq last-command-event '(?\s ?\t))) (save-excursion (skip-chars-backward " \t") (not (bolp)))) @@ -253,19 +262,13 @@ in `electric-indent-chars'." :group 'electricity (if electric-indent-mode (add-hook 'post-self-insert-hook - #'electric-indent-post-self-insert-function) + #'electric-indent-post-self-insert-function + ;; post-self-insert-hooks interact in non-trivial ways. + ;; It turns out that electric-indent-mode generally works + ;; better last. + 'append) (remove-hook 'post-self-insert-hook - #'electric-indent-post-self-insert-function)) - ;; FIXME: electric-indent-mode and electric-layout-mode interact - ;; in non-trivial ways. It turns out that electric-indent-mode works - ;; better if it is run *after* electric-layout-mode's hook. - (when (memq #'electric-layout-post-self-insert-function - (memq #'electric-indent-post-self-insert-function - (default-value 'post-self-insert-hook))) - (remove-hook 'post-self-insert-hook - #'electric-layout-post-self-insert-function) - (add-hook 'post-self-insert-hook - #'electric-layout-post-self-insert-function))) + #'electric-indent-post-self-insert-function))) ;; Electric pairing. @@ -284,6 +287,7 @@ This can be convenient for people who find it easier to hit ) than C-f." (defun electric-pair-post-self-insert-function () (let* ((syntax (and (eq (char-before) last-command-event) ; Sanity check. + electric-pair-mode (let ((x (assq last-command-event electric-pair-pairs))) (cond (x (if (eq (car x) (cdr x)) ?\" ?\()) diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el index a245a91c5c1..8527bc9e640 100644 --- a/lisp/emacs-lisp/advice.el +++ b/lisp/emacs-lisp/advice.el @@ -664,8 +664,8 @@ ;; @@@ Enabling automatic advice activation: ;; ========================================= -;; Automatic advice activation is enabled by default. It can be disabled by -;; doint `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'. +;; Automatic advice activation is enabled by default. It can be disabled with +;; `M-x ad-stop-advice' and enabled again with `M-x ad-start-advice'. ;; @@ Caching of advised definitions: ;; ================================== diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 6d5067151d3..b3ac23b2b76 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -514,6 +514,13 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE (let ((secondary-autoloads-file-buf (if (local-variable-p 'generated-autoload-file) (current-buffer)))) + ;; Ignore a buffer-local setting if it points to the + ;; global value. Otherwise we end up writing a mix of md5s + ;; and time-stamps to the global file. (Bug#10049) + (and secondary-autoloads-file-buf + outfile + (not otherbuf) + (setq secondary-autoloads-file-buf nil)) (with-current-buffer (marker-buffer output-start) (save-excursion ;; Insert the section-header line which lists the file name diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 7b98ade2422..0630f5f4e4e 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -527,7 +527,7 @@ ;; However, don't actually bother calling `ignore'. `(prog1 nil . ,(mapcar 'byte-optimize-form (cdr form)))) - ;; Neeeded as long as we run byte-optimize-form after cconv. + ;; Needed as long as we run byte-optimize-form after cconv. ((eq fn 'internal-make-closure) form) ((byte-code-function-p fn) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index fae402d4215..096e91ea4fb 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -355,7 +355,7 @@ else the global value will be modified." (defvar byte-compile-interactive-only-functions '(beginning-of-buffer end-of-buffer replace-string replace-regexp insert-file insert-buffer insert-file-literally previous-line next-line - goto-line comint-run delete-backward-char) + goto-line comint-run delete-backward-char toggle-read-only) "List of commands that are not meant to be called from Lisp.") (defvar byte-compile-not-obsolete-vars nil @@ -743,7 +743,7 @@ BYTES and PC are updated after evaluating all the arguments." (defmacro byte-compile-push-bytecode-const2 (opcode const2 bytes pc) "Push OPCODE and the two-byte constant CONST2 onto BYTES, and add 3 to PC. -CONST2 may be evaulated multiple times." +CONST2 may be evaluated multiple times." `(byte-compile-push-bytecodes ,opcode (logand ,const2 255) (lsh ,const2 -8) ,bytes ,pc)) diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el index 742a98f5e7b..c6e157be776 100644 --- a/lisp/emacs-lisp/cconv.el +++ b/lisp/emacs-lisp/cconv.el @@ -26,21 +26,21 @@ ;; This takes a piece of Elisp code, and eliminates all free variables from ;; lambda expressions. The user entry points are cconv-closure-convert and -;; cconv-closure-convert-toplevel(for toplevel forms). +;; cconv-closure-convert-toplevel (for toplevel forms). ;; All macros should be expanded beforehand. ;; ;; Here is a brief explanation how this code works. -;; Firstly, we analyse the tree by calling cconv-analyse-form. +;; Firstly, we analyze the tree by calling cconv-analyse-form. ;; This function finds all mutated variables, all functions that are suitable ;; for lambda lifting and all variables captured by closure. It passes the tree ;; once, returning a list of three lists. ;; -;; Then we calculate the intersection of first and third lists returned by +;; Then we calculate the intersection of the first and third lists returned by ;; cconv-analyse form to find all mutated variables that are captured by ;; closure. ;; Armed with this data, we call cconv-closure-convert-rec, that rewrites the -;; tree recursivly, lifting lambdas where possible, building closures where it +;; tree recursively, lifting lambdas where possible, building closures where it ;; is needed and eliminating mutable variables used in closure. ;; ;; We do following replacements : @@ -142,7 +142,7 @@ Returns a form where all lambdas don't have any free variables." (let ((cconv-freevars-alist '()) (cconv-lambda-candidates '()) (cconv-captured+mutated '())) - ;; Analyse form - fill these variables with new information. + ;; Analyze form - fill these variables with new information. (cconv-analyse-form form '()) (setq cconv-freevars-alist (nreverse cconv-freevars-alist)) (cconv-convert form nil nil))) ; Env initially empty. @@ -581,7 +581,7 @@ FORM is the parent form that binds this var." (defun cconv-analyse-form (form env) "Find mutated variables and variables captured by closure. -Analyse lambdas if they are suitable for lambda lifting. +Analyze lambdas if they are suitable for lambda lifting. - FORM is a piece of Elisp code after macroexpansion. - ENV is an alist mapping each enclosing lexical variable to its info. I.e. each element has the form (VAR . (READ MUTATED CAPTURED CALLED)). diff --git a/lisp/emacs-lisp/chart.el b/lisp/emacs-lisp/chart.el index 56930a74693..75e7d62f395 100644 --- a/lisp/emacs-lisp/chart.el +++ b/lisp/emacs-lisp/chart.el @@ -634,7 +634,7 @@ SORT-PRED if desired." (setq extlst (cons s extlst) cntlst (cons 1 cntlst))))) (setq flst (cdr flst))) - ;; Lets create the chart! + ;; Let's create the chart! (chart-bar-quickie 'vertical "Files Extension Distribution" extlst "File Extensions" cntlst "# of occurrences" @@ -693,7 +693,7 @@ SORT-PRED if desired." ;(car (nth 5 data)) ; floats are Emacs only ;(cdr (nth 5 data)) ))) - ;; Lets create the chart! + ;; Let's create the chart! (chart-bar-quickie 'vertical "Emacs Runtime Storage Usage" names "Storage Items" nums "Objects"))) @@ -710,7 +710,7 @@ SORT-PRED if desired." (if (fboundp 'x-display-list) (setq names (append names '("x-displays")) nums (append nums (list (length (x-display-list)))))) - ;; Lets create the chart! + ;; Let's create the chart! (chart-bar-quickie 'vertical "Emacs List Size Chart" names "Various Lists" nums "Objects"))) diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 176b906632c..86c7e59fd07 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -1285,7 +1285,7 @@ expressions; a `progn' form will be returned enclosing these forms." ;; Wrap a form, usually a defining form, but any evaluated one. ;; If speclist is non-nil, this is being called by edebug-defining-form. ;; Otherwise it is being called from edebug-read-and-maybe-wrap-form1. - ;; This is a hack, but I havent figured out a simpler way yet. + ;; This is a hack, but I haven't figured out a simpler way yet. (let* ((form-data-entry (edebug-get-form-data-entry form-begin form-end)) ;; Set this marker before parsing. (edebug-form-begin-marker diff --git a/lisp/emacs-lisp/eieio-base.el b/lisp/emacs-lisp/eieio-base.el index 139f5e6a4ce..df57148962f 100644 --- a/lisp/emacs-lisp/eieio-base.el +++ b/lisp/emacs-lisp/eieio-base.el @@ -54,7 +54,7 @@ not been set, use values from the parent." (defmethod slot-unbound ((object eieio-instance-inheritor) class slot-name fn) "If a slot OBJECT in this CLASS is unbound, try to inherit, or throw a signal. -SLOT-NAME is the offending slot. FN is the function signalling the error." +SLOT-NAME is the offending slot. FN is the function signaling the error." (if (slot-boundp object 'parent-instance) ;; It may not look like it, but this line recurses back into this ;; method if the parent instance's slot is unbound. diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index 1b101cef875..8869530dc23 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -92,7 +92,7 @@ Optional HEADERFCN should be called to insert a few bits of info first." (princ "Class ") (prin1 class) (terpri) - ;; Inheritence tree information + ;; Inheritance tree information (let ((pl (class-parents class))) (when pl (princ " Inherits from ") diff --git a/lisp/emacs-lisp/eieio-speedbar.el b/lisp/emacs-lisp/eieio-speedbar.el index d28ecd9615b..4ff3cc01978 100644 --- a/lisp/emacs-lisp/eieio-speedbar.el +++ b/lisp/emacs-lisp/eieio-speedbar.el @@ -282,7 +282,7 @@ Add one of the child classes to this class to the parent list of a class." :abstract t) -;;; Methods to eieio-speedbar-* which do not need to be overriden +;;; Methods to eieio-speedbar-* which do not need to be overridden ;; (defmethod eieio-speedbar-make-tag-line ((object eieio-speedbar) depth) @@ -409,7 +409,7 @@ Optional DEPTH is the depth we start at." default-directory)))) -;;; Methods to the eieio-speedbar-* classes which need to be overriden. +;;; Methods to the eieio-speedbar-* classes which need to be overridden. ;; (defmethod eieio-speedbar-object-children ((object eieio-speedbar)) "Return a list of children to be displayed in speedbar. diff --git a/lisp/emacs-lisp/eieio.el b/lisp/emacs-lisp/eieio.el index f1fe9594fc0..5e29a85d386 100644 --- a/lisp/emacs-lisp/eieio.el +++ b/lisp/emacs-lisp/eieio.el @@ -1,5 +1,5 @@ ;;; eieio.el --- Enhanced Implementation of Emacs Interpreted Objects -;;; or maybe Eric's Implementation of Emacs Intrepreted Objects +;;; or maybe Eric's Implementation of Emacs Interpreted Objects ;; Copyright (C) 1995-1996, 1998-2011 Free Software Foundation, Inc. @@ -395,7 +395,7 @@ It creates an autoload function for CNAME's constructor." (aset newc class-parent (cons SC (aref newc class-parent))) ) - ;; turn this into a useable self-pointing symbol + ;; turn this into a usable self-pointing symbol (set cname cname) ;; Store the new class vector definition into the symbol. We need to @@ -509,7 +509,7 @@ See `defclass' for more information." ;; save parent in child (aset newc class-parent (list eieio-default-superclass)))) - ;; turn this into a useable self-pointing symbol + ;; turn this into a usable self-pointing symbol (set cname cname) ;; These two tests must be created right away so we can have self- @@ -553,7 +553,7 @@ See `defclass' for more information." (put cname 'cl-deftype-handler (list 'lambda () `(list 'satisfies (quote ,csym))))) - ;; before adding new slots, lets add all the methods and classes + ;; before adding new slots, let's add all the methods and classes ;; in from the parent class (eieio-copy-parents-into-subclass newc superclasses) @@ -826,7 +826,7 @@ if default value is nil." ;; Make sure we duplicate those items that are sequences. (condition-case nil (if (sequencep d) (setq d (copy-sequence d))) - ;; This copy can fail on a cons cell with a non-cons in the cdr. Lets skip it if it doesn't work. + ;; This copy can fail on a cons cell with a non-cons in the cdr. Let's skip it if it doesn't work. (error nil)) (if (sequencep type) (setq type (copy-sequence type))) (if (sequencep cust) (setq cust (copy-sequence cust))) @@ -958,7 +958,7 @@ if default value is nil." (progn (eieio-perform-slot-validation-for-default a type value skipnil) ;; Here we have found a :class version of a slot. This - ;; requires a very different aproach. + ;; requires a very different approach. (aset newc class-class-allocation-a (cons a (aref newc class-class-allocation-a))) (aset newc class-class-allocation-doc (cons doc (aref newc class-class-allocation-doc))) (aset newc class-class-allocation-type (cons type (aref newc class-class-allocation-type))) @@ -1470,7 +1470,7 @@ created by the :initarg tag." (c (eieio-slot-name-index class obj slot))) (if (not c) ;; It might be missing because it is a :class allocated slot. - ;; Lets check that info out. + ;; Let's check that info out. (if (setq c (eieio-class-slot-name-index class slot)) ;; Oref that slot. (aref (aref (class-v class) class-class-allocation-values) c) @@ -1503,7 +1503,7 @@ Fills in OBJ's SLOT with its default value." (c (eieio-slot-name-index cl obj slot))) (if (not c) ;; It might be missing because it is a :class allocated slot. - ;; Lets check that info out. + ;; Let's check that info out. (if (setq c (eieio-class-slot-name-index cl slot)) ;; Oref that slot. @@ -1549,7 +1549,7 @@ Fills in OBJ's SLOT with VALUE." (let ((c (eieio-slot-name-index (object-class-fast obj) obj slot))) (if (not c) ;; It might be missing because it is a :class allocated slot. - ;; Lets check that info out. + ;; Let's check that info out. (if (setq c (eieio-class-slot-name-index (aref obj object-class) slot)) ;; Oset that slot. @@ -1581,7 +1581,7 @@ Fills in the default value in CLASS' in SLOT with VALUE." (c (eieio-slot-name-index class nil slot))) (if (not c) ;; It might be missing because it is a :class allocated slot. - ;; Lets check that info out. + ;; Let's check that info out. (if (setq c (eieio-class-slot-name-index class slot)) (progn ;; Oref that slot. @@ -2563,7 +2563,7 @@ This is usually a symbol that starts with `:'." ;;; ;; We want all objects created by EIEIO to have some default set of -;; behaviours so we can create object utilities, and allow various +;; behaviors so we can create object utilities, and allow various ;; types of error checking. To do this, create the default EIEIO ;; class, and when no parent class is specified, use this as the ;; default. (But don't store it in the other classes as the default, @@ -3051,7 +3051,7 @@ Optional argument GROUP is the sub-group of slots to display. ;;;### (autoloads (eieio-help-mode-augmentation-maybee eieio-describe-generic ;;;;;; eieio-describe-constructor eieio-describe-class eieio-browse) -;;;;;; "eieio-opt" "eieio-opt.el" "1bed0a56310f402683419139ebc18d7f") +;;;;;; "eieio-opt" "eieio-opt.el" "4fb6625c3a007438aab4e8e77b6c73c2") ;;; Generated autoloads from eieio-opt.el (autoload 'eieio-browse "eieio-opt" "\ diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 901b6d1bf6a..9822b556f34 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -434,7 +434,7 @@ In the absence of INDEX, just call `eldoc-docstring-format-sym-doc'." nil (list (eldoc-current-symbol) argument-index))))) -;; Move to the beginnig of current sexp. Return the number of nested +;; Move to the beginning of current sexp. Return the number of nested ;; sexp the point was over or after. (defun eldoc-beginning-of-sexp () (let ((parse-sexp-ignore-comments t) diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el index 2afe42dc070..8b64cd84bb1 100644 --- a/lisp/emacs-lisp/ert.el +++ b/lisp/emacs-lisp/ert.el @@ -248,7 +248,7 @@ Emacs bug 6581 at URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581'." ;; We disallow nil since `ert-test-at-point' and related functions ;; want to return a test name, but also need an out-of-band value ;; on failure. Nil is the most natural out-of-band value; using 0 - ;; or "" or signalling an error would be too awkward. + ;; or "" or signaling an error would be too awkward. ;; ;; Note that nil is still a valid value for the `name' slot in ;; ert-test objects. It designates an anonymous test. @@ -448,7 +448,7 @@ arguments: INNER-FORM and FORM-DESCRIPTION-FORM, where INNER-FORM is an expression equivalent to FORM, and FORM-DESCRIPTION-FORM is an expression that returns a description of FORM. INNER-EXPANDER should return code that calls INNER-FORM and performs the checks -and error signalling specific to the particular variant of +and error signaling specific to the particular variant of `should'. The code that INNER-EXPANDER returns must not call FORM-DESCRIPTION-FORM before it has called INNER-FORM." (lexical-let ((inner-expander inner-expander)) @@ -489,17 +489,17 @@ Returns nil." Determines whether CONDITION matches TYPE and EXCLUDE-SUBTYPES, and aborts the current test as failed if it doesn't." - (let ((signalled-conditions (get (car condition) 'error-conditions)) + (let ((signaled-conditions (get (car condition) 'error-conditions)) (handled-conditions (etypecase type (list type) (symbol (list type))))) - (assert signalled-conditions) - (unless (ert--intersection signalled-conditions handled-conditions) + (assert signaled-conditions) + (unless (ert--intersection signaled-conditions handled-conditions) (ert-fail (append (funcall form-description-fn) (list :condition condition - :fail-reason (concat "the error signalled did not" + :fail-reason (concat "the error signaled did not" " have the expected type"))))) (when exclude-subtypes (unless (member (car condition) handled-conditions) @@ -507,7 +507,7 @@ and aborts the current test as failed if it doesn't." (funcall form-description-fn) (list :condition condition - :fail-reason (concat "the error signalled was a subtype" + :fail-reason (concat "the error signaled was a subtype" " of the expected type")))))))) ;; FIXME: The expansion will evaluate the keyword args (if any) in @@ -515,7 +515,7 @@ and aborts the current test as failed if it doesn't." (defmacro* should-error (form &rest keys &key type exclude-subtypes) "Evaluate FORM and check that it signals an error. -The error signalled needs to match TYPE. TYPE should be a list +The error signaled needs to match TYPE. TYPE should be a list of condition names. (It can also be a non-nil symbol, which is equivalent to a singleton list containing that symbol.) If EXCLUDE-SUBTYPES is nil, the error matches TYPE if one of its @@ -523,7 +523,7 @@ condition names is an element of TYPE. If EXCLUDE-SUBTYPES is non-nil, the error matches TYPE if it is an element of TYPE. If the error matches, returns (ERROR-SYMBOL . DATA) from the -error. If not, or if no error was signalled, abort the test as +error. If not, or if no error was signaled, abort the test as failed." (unless type (setq type ''error)) (ert--expand-should @@ -2120,7 +2120,7 @@ To be used in the ERT results buffer." EWOC-FN specifies the direction and should be either `ewoc-prev' or `ewoc-next'. If there are no more nodes in that direction, an -error is signalled with the message ERROR-MESSAGE." +error is signaled with the message ERROR-MESSAGE." (loop (setq node (funcall ewoc-fn ert--results-ewoc node)) (when (null node) diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el index 08e73b32a15..070faca8d91 100644 --- a/lisp/emacs-lisp/find-func.el +++ b/lisp/emacs-lisp/find-func.el @@ -363,29 +363,23 @@ If TYPE is nil, insist on a symbol with a function definition. Otherwise TYPE should be `defvar' or `defface'. If TYPE is nil, defaults using `function-called-at-point', otherwise uses `variable-at-point'." - (let ((symb (if (null type) - (function-called-at-point) - (if (eq type 'defvar) - (variable-at-point) - (variable-at-point t)))) - (predicate (cdr (assq type '((nil . fboundp) (defvar . boundp) - (defface . facep))))) - (prompt (cdr (assq type '((nil . "function") (defvar . "variable") - (defface . "face"))))) - (enable-recursive-minibuffers t) - val) - (if (equal symb 0) - (setq symb nil)) - (setq val (completing-read - (concat "Find " - prompt - (if symb - (format " (default %s)" symb)) - ": ") - obarray predicate t nil)) - (list (if (equal val "") - symb - (intern val))))) + (let* ((symb1 (cond ((null type) (function-called-at-point)) + ((eq type 'defvar) (variable-at-point)) + (t (variable-at-point t)))) + (symb (unless (eq symb1 0) symb1)) + (predicate (cdr (assq type '((nil . fboundp) + (defvar . boundp) + (defface . facep))))) + (prompt-type (cdr (assq type '((nil . "function") + (defvar . "variable") + (defface . "face"))))) + (prompt (concat "Find " prompt-type + (and symb (format " (default %s)" symb)) + ": ")) + (enable-recursive-minibuffers t)) + (list (intern (completing-read + prompt obarray predicate + t nil nil (and symb (symbol-name symb))))))) (defun find-function-do-it (symbol type switch-fn) "Find Emacs Lisp SYMBOL in a buffer and display it. diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el index 8000dcd53dd..6905589e5be 100644 --- a/lisp/emacs-lisp/regi.el +++ b/lisp/emacs-lisp/regi.el @@ -161,7 +161,7 @@ useful information: (progn (goto-char end) (regi-pos 'bonl)) (progn (goto-char start) (regi-pos 'bol))))) - ;; lets find the special tags and remove them from the working + ;; let's find the special tags and remove them from the working ;; frame. note that only the last special tag is used. (mapc (function diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el index 56efd142198..2e388d20114 100644 --- a/lisp/emacs-lisp/rx.el +++ b/lisp/emacs-lisp/rx.el @@ -393,7 +393,7 @@ FORM is of the form `(and FORM1 ...)'." (defun rx-anything (form) "Match any character." (if (consp form) - (error "rx `anythng' syntax error: %s" form)) + (error "rx `anything' syntax error: %s" form)) (rx-or (list 'or 'not-newline ?\n))) diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index cad7c8419b2..d43ba6c0d3e 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -69,13 +69,23 @@ ;; (exp ("IF" exp "ELSE" exp "END") ("CASE" cases "END")) ;; (cases (cases "ELSE" insts) ...) ;; The IF-rule implies ELSE=END and the CASE-rule implies ELSE>END. -;; FIXME: we could try to resolve such conflicts automatically by changing -;; the way BNF rules such as the IF-rule is handled. I.e. rather than -;; IF=ELSE and ELSE=END, we could turn them into IF<ELSE and ELSE>END -;; and IF=END, +;; This can be resolved simply with: +;; (exp ("IF" expelseexp "END") ("CASE" cases "END")) +;; (expelseexp (exp) (exp "ELSE" exp)) +;; (cases (cases "ELSE" insts) ...) +;; - Another source of conflict is when a terminator/separator is used to +;; terminate elements at different levels, as in: +;; (decls ("VAR" vars) (decls "," decls)) +;; (vars (id) (vars "," vars)) +;; often these can be resolved by making the lexer distinguish the two +;; kinds of commas, e.g. based on the following token. ;; TODO & BUGS: ;; +;; - We could try to resolve conflicts such as the IFexpELSEexpEND -vs- +;; CASE(casesELSEexp)END automatically by changing the way BNF rules such as +;; the IF-rule is handled. I.e. rather than IF=ELSE and ELSE=END, we could +;; turn them into IF<ELSE and ELSE>END and IF=END. ;; - Using the structural information SMIE gives us, it should be possible to ;; implement a `smie-align' command that would automatically figure out what ;; there is to align and how to do it (something like: align the token of @@ -107,6 +117,10 @@ ;;; Code: +;; FIXME: +;; - smie-indent-comment doesn't interact well with mis-indented lines (where +;; the indent rules don't do what the user wants). Not sure what to do. + (eval-when-compile (require 'cl)) (defgroup smie nil @@ -130,7 +144,7 @@ ;; - a 2 dimensional precedence table (key word "prec2"), is a 2D ;; table recording the precedence relation (can be `<', `=', `>', or ;; nil) between each pair of tokens. -;; - a precedence-level table (key word "grammar"), which is a alist +;; - a precedence-level table (key word "grammar"), which is an alist ;; giving for each token its left and right precedence level (a ;; number or nil). This is used in `smie-grammar'. ;; The prec2 tables are only intermediate data structures: the source @@ -138,6 +152,8 @@ ;; turns them into a levels table, which is what's used by the rest of ;; the SMIE code. +(defvar smie-warning-count 0) + (defun smie-set-prec2tab (table x y val &optional override) (assert (and x y)) (let* ((key (cons x y)) @@ -149,7 +165,8 @@ ;; be able to distinguish the two cases so that overrides ;; don't hide real conflicts. (puthash key (gethash key override) table) - (display-warning 'smie (format "Conflict: %s %s/%s %s" x old val y))) + (display-warning 'smie (format "Conflict: %s %s/%s %s" x old val y)) + (incf smie-warning-count)) (puthash key val table)))) (put 'smie-precs->prec2 'pure t) @@ -193,21 +210,54 @@ one of those elements share the same precedence level and associativity." prec2))) (put 'smie-bnf->prec2 'pure t) -(defun smie-bnf->prec2 (bnf &rest precs) +(defun smie-bnf->prec2 (bnf &rest resolvers) + "Convert the BNF grammar into a prec2 table. +BNF is a list of nonterminal definitions of the form: + \(NONTERM RHS1 RHS2 ...) +where each RHS is a (non-empty) list of terminals (aka tokens) or non-terminals. +Not all grammars are accepted: +- an RHS cannot be an empty list (this is not needed, since SMIE allows all + non-terminals to match the empty string anyway). +- an RHS cannot have 2 consecutive non-terminals: between each non-terminal + needs to be a terminal (aka token). This is a fundamental limitation of + the parsing technology used (operator precedence grammar). +Additionally, conflicts can occur: +- The returned prec2 table holds constraints between pairs of + token, and for any given pair only one constraint can be + present, either: T1 < T2, T1 = T2, or T1 > T2. +- A token can either be an `opener' (something similar to an open-paren), + a `closer' (like a close-paren), or `neither' of the two (e.g. an infix + operator, or an inner token like \"else\"). +Conflicts can be resolved via RESOLVERS, which is a list of elements that can +be either: +- a precs table (see `smie-precs->prec2') to resolve conflicting constraints, +- a constraint (T1 REL T2) where REL is one of = < or >." ;; FIXME: Add repetition operator like (repeat <separator> <elems>). ;; Maybe also add (or <elem1> <elem2>...) for things like ;; (exp (exp (or "+" "*" "=" ..) exp)). ;; Basically, make it EBNF (except for the specification of a separator in ;; the repetition, maybe). - (let ((nts (mapcar 'car bnf)) ;Non-terminals - (first-ops-table ()) - (last-ops-table ()) - (first-nts-table ()) - (last-nts-table ()) - (prec2 (make-hash-table :test 'equal)) - (override (apply 'smie-merge-prec2s - (mapcar 'smie-precs->prec2 precs))) - again) + (let* ((nts (mapcar 'car bnf)) ;Non-terminals. + (first-ops-table ()) + (last-ops-table ()) + (first-nts-table ()) + (last-nts-table ()) + (smie-warning-count 0) + (prec2 (make-hash-table :test 'equal)) + (override + (let ((precs ()) + (over (make-hash-table :test 'equal))) + (dolist (resolver resolvers) + (cond + ((and (= 3 (length resolver)) (memq (nth 1 resolver) '(= < >))) + (smie-set-prec2tab + over (nth 0 resolver) (nth 2 resolver) (nth 1 resolver))) + ((memq (caar resolver) '(left right assoc nonassoc)) + (push resolver precs)) + (t (error "Unknown resolver %S" resolver)))) + (apply #'smie-merge-prec2s over + (mapcar 'smie-precs->prec2 precs)))) + again) (dolist (rules bnf) (let ((nt (car rules)) (last-ops ()) @@ -287,8 +337,11 @@ one of those elements share the same precedence level and associativity." (setq rhs (cdr rhs))))) ;; Keep track of which tokens are openers/closer, so they can get a nil ;; precedence in smie-prec2->grammar. - (puthash :smie-open/close-alist (smie-bnf-classify bnf) prec2) - (puthash :smie-closer-alist (smie-bnf-closer-alist bnf) prec2) + (puthash :smie-open/close-alist (smie-bnf--classify bnf) prec2) + (puthash :smie-closer-alist (smie-bnf--closer-alist bnf) prec2) + (if (> smie-warning-count 0) + (display-warning + 'smie (format "Total: %d warnings" smie-warning-count))) prec2)) ;; (defun smie-prec2-closer-alist (prec2 include-inners) @@ -343,7 +396,7 @@ one of those elements share the same precedence level and associativity." ;; openers) ;; alist))) -(defun smie-bnf-closer-alist (bnf &optional no-inners) +(defun smie-bnf--closer-alist (bnf &optional no-inners) ;; We can also build this closer-alist table from a prec2 table, ;; but it takes more work, and the order is unpredictable, which ;; is a problem for smie-close-block. @@ -371,37 +424,33 @@ from the table, e.g. the table will not include things like (\"if\" . \"else\"). (pushnew (cons (car rhs) term) alist :test #'equal))))))) (nreverse alist))) -(defun smie-bnf-classify (bnf) +(defun smie-bnf--set-class (table token class) + (let ((prev (gethash token table class))) + (puthash token + (cond + ((eq prev class) class) + ((eq prev t) t) ;Non-terminal. + (t (display-warning + 'smie + (format "token %s is both %s and %s" token class prev)) + 'neither)) + table))) + +(defun smie-bnf--classify (bnf) "Return a table classifying terminals. -Each terminal can either be an `opener', a `closer', or neither." +Each terminal can either be an `opener', a `closer', or `neither'." (let ((table (make-hash-table :test #'equal)) - (nts (mapcar #'car bnf)) (alist '())) (dolist (category bnf) - (puthash (car category) 'neither table) ;Remove non-terminals. + (puthash (car category) t table)) ;Mark non-terminals. + (dolist (category bnf) (dolist (rhs (cdr category)) (if (null (cdr rhs)) - (puthash (pop rhs) 'neither table) - (let ((first (pop rhs))) - (puthash first - (if (memq (gethash first table) '(nil opener)) - 'opener - (unless (member first nts) - (error "SMIE: token %s is both opener and non-opener" - first)) - 'neither) - table)) - (while (cdr rhs) - (puthash (pop rhs) 'neither table)) ;Remove internals. - (let ((last (pop rhs))) - (puthash last - (if (memq (gethash last table) '(nil closer)) - 'closer - (unless (member last nts) - (error "SMIE: token %s is both closer and non-closer" - last)) - 'neither) - table))))) + (smie-bnf--set-class table (pop rhs) 'neither) + (smie-bnf--set-class table (pop rhs) 'opener) + (while (cdr rhs) ;Remove internals. + (smie-bnf--set-class table (pop rhs) 'neither)) + (smie-bnf--set-class table (pop rhs) 'closer)))) (maphash (lambda (tok v) (when (memq v '(closer opener)) (push (cons tok v) alist))) @@ -692,8 +741,22 @@ Possible return values: ;; Keep looking as long as we haven't matched the ;; topmost operator. (levels - (if (numberp (funcall op-forw toklevels)) - (push toklevels levels))) + (cond + ((numberp (funcall op-forw toklevels)) + (push toklevels levels)) + ;; FIXME: For some languages, we can express the grammar + ;; OK, but next-sexp doesn't stop where we'd want it to. + ;; E.g. in SML, we'd want to stop right in front of + ;; "local" if we're scanning (both forward and backward) + ;; from a "val/fun/..." at the same level. + ;; Same for Pascal/Modula2's "procedure" w.r.t + ;; "type/var/const". + ;; + ;; ((and (functionp (cadr (funcall op-forw toklevels))) + ;; (funcall (cadr (funcall op-forw toklevels)) + ;; levels)) + ;; (setq levels nil)) + )) ;; We matched the topmost operator. If the new operator ;; is the last in the corresponding BNF rule, we're done. ((not (numberp (funcall op-forw toklevels))) @@ -759,7 +822,7 @@ Possible return values: (indirect-function 'smie-op-left) halfsexp)) -;;; Miscellanous commands using the precedence parser. +;;; Miscellaneous commands using the precedence parser. (defun smie-backward-sexp-command (&optional n) "Move backward through N logical elements." @@ -980,7 +1043,7 @@ function should return nil for arguments it does not expect. OFFSET can be: nil use the default indentation rule. -`(column . COLUMN) indent to column COLUMN. +\(column . COLUMN) indent to column COLUMN. NUMBER offset by NUMBER, relative to a base token which is the current token for :after and its parent for :before. @@ -1579,8 +1642,9 @@ KEYWORDS are additional arguments, which can use the following keywords: (while (setq closer (pop closers)) (unless (and closers ;; FIXME: this eliminates prefixes of other - ;; closers, but we should probably elimnate - ;; prefixes of other keywords as well. + ;; closers, but we should probably + ;; eliminate prefixes of other keywords + ;; as well. (string-prefix-p closer (car closers))) (push (aref closer (1- (length closer))) triggers))) (delete-dups triggers))))))) diff --git a/lisp/emacs-lisp/tabulated-list.el b/lisp/emacs-lisp/tabulated-list.el index 75c9a01323d..e16970c6804 100644 --- a/lisp/emacs-lisp/tabulated-list.el +++ b/lisp/emacs-lisp/tabulated-list.el @@ -321,7 +321,7 @@ This mode is usually not used directly; instead, other major modes are derived from it, using `define-derived-mode'. In this major mode, the buffer is divided into multiple columns, -which are labelled using the header line. Each non-empty line +which are labeled using the header line. Each non-empty line belongs to one \"entry\", and the entries can be sorted according to their column values. diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el index cc3e633f098..7144138445c 100644 --- a/lisp/emacs-lisp/tcover-unsafep.el +++ b/lisp/emacs-lisp/tcover-unsafep.el @@ -100,7 +100,7 @@ . (risky-local-variable format-alist)) ( (setq buffer-display-count (delete-file "x")) . (function delete-file)) - ;;These are actualy safe (they signal errors) + ;;These are actually safe (they signal errors) ( (apply '(x) '(1 2 3)) . (function (x))) ( (let (((x))) 1) diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el index 4c83e7e2e0d..8f991575eda 100644 --- a/lisp/emacs-lisp/testcover.el +++ b/lisp/emacs-lisp/testcover.el @@ -509,7 +509,7 @@ eliminated by adding more test cases." (set-buffer-modified-p changed)))) (defun testcover-mark-all (&optional buffer) - "Mark all forms in BUFFER that did not get completley tested during + "Mark all forms in BUFFER that did not get completely tested during coverage tests. This function creates many overlays." (interactive "bMark forms in buffer: ") (if buffer diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el index 010e32857c5..71e607140de 100644 --- a/lisp/emulation/crisp.el +++ b/lisp/emulation/crisp.el @@ -34,7 +34,7 @@ ;; you put (setq crisp-load-scroll-all t) in your .emacs before ;; loading this package. If this feature is enabled, it will bind ;; meta-f1 to the scroll-all mode toggle. The scroll-all package -;; duplicates the scroll-alling feature in CRiSP. +;; duplicates the scroll-all feature in CRiSP. ;; Also, the default keybindings for brief/CRiSP override the M-x ;; key to exit the editor. If you don't like this functionality, you diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el index 5d90ac694a4..76cab39f5b2 100644 --- a/lisp/emulation/cua-rect.el +++ b/lisp/emulation/cua-rect.el @@ -741,7 +741,7 @@ If command is repeated at same position, delete the rectangle." ;; We try to reuse overlays where possible because this is more efficient ;; and results in less flicker. ;; If cua--rectangle-virtual-edges is nil and the buffer contains tabs or short lines, - ;; the higlighted region may not be perfectly rectangular. + ;; the highlighted region may not be perfectly rectangular. (let ((deactivate-mark deactivate-mark) (old cua--rectangle-overlays) (new nil) diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el index 7ed0255d987..acdc3caa449 100644 --- a/lisp/emulation/edt.el +++ b/lisp/emulation/edt.el @@ -2484,7 +2484,7 @@ Argument GOLD-BINDING is the Emacs function to be bound to GOLD <KEY>." F10: Cut Rectangle G-F10: Paste Rectangle F11: ESC - F12: Begining of Line +----------+----------+----------+----------+ + F12: Beginning of Line +----------+----------+----------+----------+ G-F12: Delete Other Windows | GOLD | HELP | FNDNXT | DEL L | F13: Delete to Begin of Word | (PF1) | (PF2) | (PF3) | (PF4) | HELP: Keypad Help |Mark Wisel|Desc Funct| FIND | UND L | diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 359b3ff751d..df37157f7a9 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -1599,7 +1599,7 @@ as a Meta key and any number of multiple escapes are allowed." ;; call viper-execute-com to execute viper-exec-change, which eventually will ;; call viper-change to invoke the replace mode on the region. ;; -;; The var viper-d-com is set to (M-COM VAL COM REG INSETED-TEXT COMMAND-KEYS) +;; The var viper-d-com is set to (M-COM VAL COM REG INSERTED-TEXT COMMAND-KEYS) ;; via a call to viper-set-destructive-command, for later use by viper-repeat. (defun viper-execute-com (m-com val com) (let ((reg viper-use-register)) diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 24a38236176..fcab8b57c1e 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -871,7 +871,7 @@ Otherwise return the normal value." (abbreviate-file-name file))) ;; Sit for VAL milliseconds. XEmacs doesn't support the millisecond arg -;; in sit-for, so this function smoothes out the differences. +;; in sit-for, so this function smooths out the differences. (defsubst viper-sit-for-short (val &optional nodisp) (sit-for (/ val 1000.0) nodisp)) @@ -1112,7 +1112,7 @@ Otherwise return the normal value." lis))) -;; Smoothes out the difference between Emacs' unread-command-events +;; Smooths out the difference between Emacs' unread-command-events ;; and XEmacs unread-command-event. Arg is a character, an event, a list of ;; events or a sequence of keys. ;; diff --git a/lisp/epg.el b/lisp/epg.el index 9ca07e213b4..00c00f9c9d3 100644 --- a/lisp/epg.el +++ b/lisp/epg.el @@ -356,7 +356,7 @@ query by itself and Emacs can intercept them." PROGRESS-CALLBACK is either a function, or a cons-cell whose car is a function and cdr is a callback data. -The function gets five arguments: the context, the operation +The function gets six arguments: the context, the operation description, the character to display a progress unit, the current amount done, the total amount to be done, and the callback data (if any)." @@ -2031,7 +2031,7 @@ CIPHER must be a file data object. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-decrypt-file' or `epg-decrypt-string' instead." (unless (epg-data-file cipher) @@ -2097,7 +2097,7 @@ For a normal or a cleartext signature, SIGNED-TEXT should be nil. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-verify-file' or `epg-verify-string' instead." (epg-context-set-operation context 'verify) @@ -2195,7 +2195,7 @@ Otherwise, it makes a cleartext signature. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-sign-file' or `epg-sign-string' instead." (epg-context-set-operation context 'sign) @@ -2299,7 +2299,7 @@ If RECIPIENTS is nil, it performs symmetric encryption. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-encrypt-file' or `epg-encrypt-string' instead." (epg-context-set-operation context 'encrypt) @@ -2414,7 +2414,7 @@ If RECIPIENTS is nil, it performs symmetric encryption." If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-export-keys-to-file' or `epg-export-keys-to-string' instead." (epg-context-set-operation context 'export-keys) @@ -2457,7 +2457,7 @@ KEYS is a data object. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-import-keys-from-file' or `epg-import-keys-from-string' instead." (epg-context-set-operation context 'import-keys) @@ -2498,7 +2498,7 @@ KEY-ID-LIST is a list of key IDs. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-receive-keys' instead." (epg-context-set-operation context 'receive-keys) @@ -2526,7 +2526,7 @@ KEYS is a list of key IDs" If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-delete-keys' instead." (epg-context-set-operation context 'delete-keys) @@ -2558,7 +2558,7 @@ If you are unsure, use synchronous version of this function If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-sign-keys' instead." (epg-context-set-operation context 'sign-keys) @@ -2593,7 +2593,7 @@ PARAMETERS specifies parameters for the key. If you use this function, you will need to wait for the completion of `epg-gpg-program' by using `epg-wait-for-completion' and call -`epg-reset' to clear a temporaly output file. +`epg-reset' to clear a temporary output file. If you are unsure, use synchronous version of this function `epg-generate-key-from-file' or `epg-generate-key-from-string' instead." (epg-context-set-operation context 'generate-key) diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index d72d3f51bb1..9a029893352 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2011-11-14 Juanma Barranquero <lekktu@gmail.com> + + * erc-notify.el (erc-notify-interval, erc-cmd-NOTIFY): Fix typos. + 2011-10-20 Chong Yidong <cyd@gnu.org> * erc.el (define-erc-module): Fix autogenerated docstring to diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01 index 4016586abc7..1e90b33a23b 100644 --- a/lisp/erc/ChangeLog.01 +++ b/lisp/erc/ChangeLog.01 @@ -160,9 +160,9 @@ * debian/control: integrated erc-speak back into erc - * debian/maint/conffiles, debian/maint/conffiles.in, debian/maint/postinst, - debian/maint/postinst.in, debian/maint/prerm, debian/maint/prerm.in, - debian/scripts/install, debian/scripts/install.in, debian/scripts/remove, + * debian/maint/conffiles, debian/maint/conffiles.in, debian/maint/postinst, + debian/maint/postinst.in, debian/maint/prerm, debian/maint/prerm.in, + debian/scripts/install, debian/scripts/install.in, debian/scripts/remove, debian/scripts/remove.in, debian/scripts/startup.erc-speak: since erc-speak is gone, resurrect the static files, and update them to support the latest erc @@ -220,7 +220,7 @@ * erc.el: * Applied antifuchs/mhp patches, the latest on erc-help, unmodified * New variable: erc-reuse-buffers default to t. - * Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, + * Modified erc-generate-new-buffer-name to use it. it checks if server and port are the same, then one can assume thats the same channel/query target again. 2001-11-23 Mario Lang <mlang@delysid.org> @@ -238,7 +238,7 @@ * erc.el: * New local variable, erc-announced-server-name * erc-mode-line-format supports a new symbol, target-and/or-server - * The mode-line displays the announced server name now (for autojoin later..., + * The mode-line displays the announced server name now (for autojoin later..., greets Adam) * New macro, erc-server-hook-list for a nice way to define the defcustoms of the erc-server-*-hook's Thanks go to the guy from #emacs who helped with that @@ -457,7 +457,7 @@ * erc.el: * Reduction patch 2 This time, we move the input ring handling into erc-ring.el Remember that you need (require 'erc-ring) in your .emacs to get the input handling as a feature - And remeber, that you don't need it if you don't use input ring :-) + And remember, that you don't need it if you don't use input ring :-) * erc-ring.el: * Initial checkin @@ -603,11 +603,11 @@ * debian/control: added the new erc-speak package - * debian/README.erc-speak, debian/maint/postinst.in, debian/maint/prerm.in, + * debian/README.erc-speak, debian/maint/postinst.in, debian/maint/prerm.in, debian/scripts/install.in, debian/scripts/remove.in: new file - * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, + * debian/maint/postinst, debian/maint/prerm, debian/scripts/install, debian/scripts/remove: removed, superseded by its .in counterpart @@ -625,7 +625,7 @@ 2001-10-23 Mario Lang <mlang@delysid.org> * erc-speak.el: - * Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, + * Added a new personality for channel name announcement, This makes streams of flooded channels much easier to listen to, especially if you are on more than one channel simultaneously. * erc.el: @@ -643,7 +643,7 @@ * Removed now really obsolete code. Package size reduced by 50% * erc-speak.el: - * Very important fix! Now erc-speak is really complete. Messages don't get cut anymore. Be sure to use auditory icons, + * Very important fix! Now erc-speak is really complete. Messages don't get cut anymore. Be sure to use auditory icons, it's reallllly cool now!!! * erc-speak.el: *** empty log message *** @@ -655,9 +655,9 @@ * debian/changelog: oops, silly typo - * debian/changelog, debian/control, debian/copyright, - debian/maint/conffiles, debian/maint/postinst, debian/maint/prerm, - debian/rules, debian/scripts/install, debian/scripts/remove, + * debian/changelog, debian/control, debian/copyright, + debian/maint/conffiles, debian/maint/postinst, debian/maint/prerm, + debian/rules, debian/scripts/install, debian/scripts/remove, debian/scripts/startup: initial check-in @@ -666,7 +666,7 @@ * erc.el: * Changed erc-insert-hook to get two arguments, START and END of the region which got inserted. CAREFUL! This could break stuff, but it makes the hook - much more useable. + much more usable. * erc.el: * Made erc-smiley a new option, currently set to t to showoff this feature. :) @@ -826,11 +826,11 @@ * (erc-complete-nick): Add ": " only if one completes directly after the erc-prompt, otherwise, add just one space * erc.el: - * Changed menu-definition to use easymenu (hopefully this now works under Xemacs) + * Changed menu-definition to use easymenu (hopefully this now works under XEmacs) * Fix for custom problem with :must-match on XEmacs (thanks shapr) * Added /COUNTRY command using (what-domain) from package mail-extr (shapr) * Fix for case-sensitivity problem with pals (they are now all downcased) - * Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, + * Different (erc-version) function which now can take prefix argument to insert the version information into the current buffer, instead of just displaying it in the minibuffer. 2001-09-10 Mario Lang <mlang@delysid.org> @@ -1055,4 +1055,3 @@ ;; Local Variables: ;; coding: utf-8 ;; End: - diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02 index 09ab1cb3796..d1b05a23140 100644 --- a/lisp/erc/ChangeLog.02 +++ b/lisp/erc/ChangeLog.02 @@ -1373,7 +1373,7 @@ * erc-menu.el: * changed how we check if we should activate "Track hidden channels" and - whether it should be selected - fixes a bug Xemacs where whole menu bar + whether it should be selected - fixes a bug XEmacs where whole menu bar does not work if menu is loaded * erc-menu.el: @@ -1545,7 +1545,7 @@ * added s461 to english catalog - * fixed bug where Xemacs would not quit if erc-quit-reason was + * fixed bug where XEmacs would not quit if erc-quit-reason was set to erc-quit-reason-various and assoc-default was not defined 2002-06-04 Andreas Fuchs <asf@void.at> diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03 index 7f82a9bcbe2..956ef5f4c66 100644 --- a/lisp/erc/ChangeLog.03 +++ b/lisp/erc/ChangeLog.03 @@ -323,7 +323,7 @@ * erc.el(erc-modules): Add some more symbols to the set - * erc.el(erc-modules): * erc.el(erc-modules): Add :greedy t to the set in + * erc.el(erc-modules): * erc.el(erc-modules): Add :greedy t to the set in * erc-dcc.el: More autoloads which make dcc autoload upon ctcp dcc query received. @@ -744,7 +744,7 @@ 2003-04-27 Damien Elmes <erc@repose.cx> - * erc.el: * erc.el: erc-modules: added + * erc.el: * erc.el: erc-modules: added 2003-04-27 Alex Schroeder <alex@gnu.org> @@ -1232,7 +1232,7 @@ 2003-01-19 Mario Lang <mlang@delysid.org> - * debian/README.Debian, debian/changelog, debian/scripts/install, + * debian/README.Debian, debian/changelog, debian/scripts/install, debian/scripts/startup.erc, Makefile: Prepare for 20030119 debian package @@ -1305,7 +1305,7 @@ * (erc-current-logfile): call expand-file-name, so that downcase doesn't mess up ~ * erc.el: * (erc-mode): Define a proper case-table. - * (erc-downcase): just call downcase for now, lets see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway... + * (erc-downcase): just call downcase for now, let's see if the case-table is portable, if yes, we'll remove all erc-downcase references anyway... * erc-button.el: * (erc-button-add-buttons): regex-quote the nick @@ -1600,7 +1600,8 @@ * erc-dcc.el: * erc-dcc-ipv4-regexp: New constant * (erc-ip-to-decimal): Use it. - * erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp: * erc-dcc-host: :type + * erc-dcc-host:valid-regexp erc-dcc-ipv4-regexp: + * erc-dcc-host: :type * (pcomplete/erc-mode/DCC): Add completion for GET and CLOSE. * Some docstring/comment fixes. @@ -1609,8 +1610,8 @@ POS in any case, otherwise, linewrap occurs. * erc-dcc.el: - * Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), - and saves correctly (tried with 21.3.50). Thanks to Eli for suggesting it! + * Fixed the unibyte-multibyte problem (now a dcc get buffer is (set-buffer-multibyte nil), + and saves correctly (tried with 21.3.50)). Thanks to Eli for suggesting it! * Added :start-time plist property/value to GET handling so that we can calculate elapsed-time. * Some (unwind-protect (progn (set-buffer ...) ...)) constructs replaced with (with-current-buffer ...) @@ -1691,12 +1692,12 @@ 2003-01-11 Mario Lang <mlang@delysid.org> - * erc-dcc.el: * erc-dcc.el: * (erc-dcc-do-LIST-command): Fix + * erc-dcc.el: * erc-dcc.el: * (erc-dcc-do-LIST-command): Fix * erc-dcc.el: * buffer-local variables erc-dcc-sent-marker and erc-dcc-send-confirmed marker removed Keep This info in erc-dcc-member :sent and :confirmed plist values - * : * :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer + * : * :buffer plist for :type 'SEND removed, since we can get this with (marker-buffer * erc-dcc-send-connect-hook: New hook, defaults to erc-dcc-send-block and erc-dcc-send-connected, which now prints a msg... * erc-dcc.el: @@ -1985,7 +1986,7 @@ (erc-server-PRIVMSG-or-NOTICE): Capitalized first word in message to user. * erc.el(erc-scroll-to-bottom): - Temporarilly bind resize-mini-windows to nil so that + Temporarily bind resize-mini-windows to nil so that users who have it set to a non-nil value will not suffer from premature minibuffer shrinkage due to the below recenter call. I have no idea why this works, but it solves the problem, and has no negative side effects. @@ -2160,4 +2161,3 @@ See ChangeLog.02 for earlier changes. ;; Local Variables: ;; coding: utf-8 ;; End: - diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04 index 7db040fd23f..ff47372b8e3 100644 --- a/lisp/erc/ChangeLog.04 +++ b/lisp/erc/ChangeLog.04 @@ -136,7 +136,7 @@ 2004-12-14 Diane Murray <disumu@x3y2z1.net> * erc.el: The last change to `erc-mode-line-format' introduced a - bug in Xemacs - it can't handle the #(" "...) strings at all. The + bug in XEmacs - it can't handle the #(" "...) strings at all. The following changes fix the bug and simplify the mode-line handling considerably. (erc-mode-line-format): Now defined as a string which will be formatted using `format-spec' and take the place of diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el index a15e038dddc..74172b2573f 100644 --- a/lisp/erc/erc-autoaway.el +++ b/lisp/erc/erc-autoaway.el @@ -263,7 +263,7 @@ exceeds `erc-autoaway-idle-seconds'." "Set the away state globally. If NOTEST is specified, do not check to see whether there is an -activer server buffer available." +active server buffer available." ;; Note that the idle timer runs, even when Emacs is inactive. In ;; order to prevent flooding when we connect, we test for an ;; existing process. @@ -284,4 +284,3 @@ activer server buffer available." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el index d363ea92bdb..f86c9ef845a 100644 --- a/lisp/erc/erc-backend.el +++ b/lisp/erc/erc-backend.el @@ -79,7 +79,7 @@ ;;; TODO: -;; o Generalise the display-line code so that we can use it to +;; o Generalize the display-line code so that we can use it to ;; display the stuff we send, as well as the stuff we receive. ;; Then, move all display-related code into another backend-like ;; file, erc-display.el, say. @@ -2000,4 +2000,3 @@ See `erc-display-error-notice'." nil ;; Local Variables: ;; indent-tabs-mode: nil ;; End: - diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el index 1b245ec2e33..10f6806ec12 100644 --- a/lisp/erc/erc-notify.el +++ b/lisp/erc/erc-notify.el @@ -46,7 +46,7 @@ status change." :type '(repeat string)) (defcustom erc-notify-interval 60 - "*Time interval (in seconds) for checking online status of notificated + "*Time interval (in seconds) for checking online status of notified people." :group 'erc-notify :type 'integer) @@ -88,7 +88,7 @@ strings." (defun erc-notify-install-message-catalogs () (erc-define-catalog 'english - '((notify_current . "Notificated people online: %l") + '((notify_current . "Notified people online: %l") (notify_list . "Current notify list: %l") (notify_on . "Detected %n on IRC network %m") (notify_off . "%n has left IRC network %m")))) @@ -197,11 +197,11 @@ nick from `erc-last-ison' to prevent any further notifications." ;;;###autoload (defun erc-cmd-NOTIFY (&rest args) "Change `erc-notify-list' or list current notify-list members online. -Without args, list the current list of notificated people online, +Without args, list the current list of notified people online, with args, toggle notify status of people." (cond ((null args) - ;; Print current notificated people (online) + ;; Print current notified people (online) (let ((ison (erc-with-server-buffer erc-last-ison))) (if (not ison) (erc-display-message @@ -250,4 +250,3 @@ with args, toggle notify status of people." ;; indent-tabs-mode: t ;; tab-width: 8 ;; End: - diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el index 993e9d63a94..db5e98062a9 100644 --- a/lisp/eshell/em-hist.el +++ b/lisp/eshell/em-hist.el @@ -609,7 +609,7 @@ See also `eshell-read-history'." history)))) (setq index (1- index))) (let ((fhist (list t))) - ;; uniqify the list, but preserve the order + ;; uniquify the list, but preserve the order (while history (unless (member (car history) fhist) (nconc fhist (list (car history)))) diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el index 1fb8b7f4c32..dcb23967645 100644 --- a/lisp/eshell/esh-arg.el +++ b/lisp/eshell/esh-arg.el @@ -311,7 +311,7 @@ special character that is not itself a backslash." (char-to-string (char-before)))) ;; allow \\<RET> to mean a literal "\" character followed by a ;; normal return, rather than a backslash followed by a line - ;; continuator (i.e., "\\ + \n" rather than "\ + \\n"). This + ;; continuation (i.e., "\\ + \n" rather than "\ + \\n"). This ;; is necessary because backslashes in Eshell are not special ;; unless they either precede something special, or precede a ;; backslash that precedes something special. (Mainly this is diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el index 52c8c2ddc20..7b90797eb43 100644 --- a/lisp/eshell/esh-cmd.el +++ b/lisp/eshell/esh-cmd.el @@ -247,7 +247,7 @@ will have to visit the file 'eshell-cmd.el' and run the command '(eshell-named-command eshell-lisp-command eshell-process-identity) - "A list of functions which might return an ansychronous process. + "A list of functions which might return an asynchronous process. If they return a process object, execution of the calling Eshell command will wait for completion (in the background) before finishing the command." @@ -480,25 +480,20 @@ implemented via rewriting, rather than as a function." (let ((body (car (last terms)))) (setcdr (last terms 2) nil) `(let ((for-items - ;; Apparently, eshell-do-eval only works for immutable - ;; let-bindings, i.e. we cannot use `setq' on `for-items'. - ;; Instead we store the list in the car of a cons-cell (which - ;; acts as a ref-cell) so we can setcar instead of setq. - (list - (append - ,@(mapcar - (lambda (elem) - (if (listp elem) - elem - `(list ,elem))) - (cdr (cddr terms)))))) + (append + ,@(mapcar + (lambda (elem) + (if (listp elem) + elem + `(list ,elem))) + (cdr (cddr terms))))) (eshell-command-body '(nil)) (eshell-test-body '(nil))) - (while (consp (car for-items)) - (let ((,(intern (cadr terms)) (caar for-items))) + (while (consp for-items) + (let ((,(intern (cadr terms)) (car for-items))) (eshell-protect ,(eshell-invokify-arg body t))) - (setcar for-items (cdar for-items))) + (setq for-items (cdr for-items))) (eshell-close-handles eshell-last-command-status (list 'quote eshell-last-command-result)))))) @@ -766,9 +761,8 @@ This macro calls itself recursively, with NOTFIRST non-nil." `(eshell-copy-handles (progn ,(when (cdr pipeline) - `(let (nextproc) - (setq nextproc - (eshell-do-pipelines (quote ,(cdr pipeline)) t)) + `(let ((nextproc + (eshell-do-pipelines (quote ,(cdr pipeline)) t))) (eshell-set-output-handle ,eshell-output-handle 'append nextproc) (eshell-set-output-handle ,eshell-error-handle @@ -796,10 +790,9 @@ This macro calls itself recursively, with NOTFIRST non-nil." Output of each command is passed as input to the next one in the pipeline. This is used on systems where `start-process' is not supported." (when (setq pipeline (cadr pipeline)) - `(let (result) + `(progn ,(when (cdr pipeline) - `(let (output-marker) - (setq output-marker ,(point-marker)) + `(let ((output-marker ,(point-marker))) (eshell-set-output-handle ,eshell-output-handle 'append output-marker) (eshell-set-output-handle ,eshell-error-handle @@ -811,21 +804,21 @@ This is used on systems where `start-process' is not supported." (when (memq (car head) eshell-deferrable-commands) (ignore (setcar head - (intern-soft - (concat (symbol-name (car head)) "*")))))) - ;; The last process in the pipe should get its handles + (intern-soft + (concat (symbol-name (car head)) "*")))))) + ;; The last process in the pipe should get its handles ;; redirected as we found them before running the pipe. ,(if (null (cdr pipeline)) `(progn (setq eshell-current-handles tail-handles) (setq eshell-in-pipeline-p nil))) - (setq result ,(car pipeline)) - ;; tailproc gets the result of the last successful process in - ;; the pipeline. - (setq tailproc (or result tailproc)) - ,(if (cdr pipeline) - `(eshell-do-pipelines-synchronously (quote ,(cdr pipeline)))) - result))) + (let ((result ,(car pipeline))) + ;; tailproc gets the result of the last successful process in + ;; the pipeline. + (setq tailproc (or result tailproc)) + ,(if (cdr pipeline) + `(eshell-do-pipelines-synchronously (quote ,(cdr pipeline)))) + result)))) (defalias 'eshell-process-identity 'identity) @@ -890,8 +883,7 @@ Returns a string comprising the output from the command." (eshell-print "errors\n")) (if eshell-debug-command (eshell-print "commands\n"))) - ((or (string= (car args) "-h") - (string= (car args) "--help")) + ((member (car args) '("-h" "--help")) (eshell-print "usage: eshell-debug [kinds] This command is used to aid in debugging problems related to Eshell @@ -1091,6 +1083,11 @@ be finished later after the completion of an asynchronous subprocess." (eshell-manipulate "handling special form" (setcar args `(eshell-do-eval ',(car args) ,synchronous-p)))) (eval form)) + ((eq (car form) 'setq) + (if (cddr args) (error "Unsupported form (setq X1 E1 X2 E2..)")) + (eshell-manipulate "evaluating arguments to setq" + (setcar (cdr args) (eshell-do-eval (cadr args) synchronous-p))) + (list 'quote (eval form))) (t (if (and args (not (memq (car form) '(run-hooks)))) (eshell-manipulate @@ -1127,11 +1124,12 @@ be finished later after the completion of an asynchronous subprocess." ;; Thus, aliases can even contain references to asynchronous ;; sub-commands, and things will still work out as they ;; should. - (let (result new-form) - (if (setq new-form - (catch 'eshell-replace-command - (ignore - (setq result (eval form))))) + (let* (result + (new-form + (catch 'eshell-replace-command + (ignore + (setq result (eval form)))))) + (if new-form (progn (eshell-manipulate "substituting replacement form" (setcar form (car new-form)) @@ -1247,25 +1245,23 @@ or an external command." PRINTER and ERRPRINT are functions to use for printing regular messages, and errors. FORM-P should be non-nil if FUNC-OR-FORM represent a lisp form; ARGS will be ignored in that case." - (let (result) - (eshell-condition-case err - (progn - (setq result - (save-current-buffer - (if form-p - (eval func-or-form) - (apply func-or-form args)))) - (and result (funcall printer result)) - result) - (error - (let ((msg (error-message-string err))) - (if (and (not form-p) - (string-match "^Wrong number of arguments" msg) - (fboundp 'eldoc-get-fnsym-args-string)) - (let ((func-doc (eldoc-get-fnsym-args-string func-or-form))) - (setq msg (format "usage: %s" func-doc)))) - (funcall errprint msg)) - nil)))) + (eshell-condition-case err + (let ((result + (save-current-buffer + (if form-p + (eval func-or-form) + (apply func-or-form args))))) + (and result (funcall printer result)) + result) + (error + (let ((msg (error-message-string err))) + (if (and (not form-p) + (string-match "^Wrong number of arguments" msg) + (fboundp 'eldoc-get-fnsym-args-string)) + (let ((func-doc (eldoc-get-fnsym-args-string func-or-form))) + (setq msg (format "usage: %s" func-doc)))) + (funcall errprint msg)) + nil))) (defsubst eshell-apply* (printer errprint func args) "Call FUNC, with ARGS, trapping errors and return them as output. diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el index 9abb0c8ecc0..43d56a5b89f 100644 --- a/lisp/eshell/esh-mode.el +++ b/lisp/eshell/esh-mode.el @@ -607,7 +607,7 @@ will return the parsed command." (setq command (eshell-parse-command (cons beg end) args t))))) (ignore - (message "Expecting completion of delimeter %c ..." + (message "Expecting completion of delimiter %c ..." (if (listp delim) (car delim) delim))) diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el index 424d246a2b6..bbb453be711 100644 --- a/lisp/eshell/esh-util.el +++ b/lisp/eshell/esh-util.el @@ -140,14 +140,13 @@ function `string-to-number'." (defmacro eshell-condition-case (tag form &rest handlers) "If `eshell-handle-errors' is non-nil, this is `condition-case'. Otherwise, evaluates FORM with no error handling." + (declare (indent 2)) (if eshell-handle-errors `(condition-case ,tag ,form ,@handlers) form)) -(put 'eshell-condition-case 'lisp-indent-function 2) - (defun eshell-find-delimiter (open close &optional bound reverse-p backslash-p) "From point, find the CLOSE delimiter corresponding to OPEN. @@ -275,14 +274,14 @@ Prepend remote identification of `default-directory', if any." text)) (defmacro eshell-for (for-var for-list &rest forms) - "Iterate through a list" + "Iterate through a list." + (declare (indent 2)) `(let ((list-iter ,for-list)) (while list-iter (let ((,for-var (car list-iter))) ,@forms) (setq list-iter (cdr list-iter))))) -(put 'eshell-for 'lisp-indent-function 2) (make-obsolete 'eshell-for 'dolist "24.1") diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el index 69004a841f1..03774396485 100644 --- a/lisp/eshell/esh-var.el +++ b/lisp/eshell/esh-var.el @@ -344,7 +344,7 @@ This function is explicit for adding to `eshell-parse-argument-hook'." (pcomplete-here)))) (defun eshell/env (&rest args) - "Implemention of `env' in Lisp." + "Implementation of `env' in Lisp." (eshell-init-print-buffer) (eshell-eval-using-options "env" args diff --git a/lisp/expand.el b/lisp/expand.el index 544d0b1cb17..beb76321781 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -111,7 +111,7 @@ ("while" "while () {\n\n}" (8 12)) ("default" "default:\n\nbreak;" 10) ("main" "int\nmain(int argc, char * argv[])\n{\n\n}\n" 37)) - "Expansions for C mode. See `expand-add-abbrevs'.") + "Expansions for C mode. See `expand-add-abbrevs'.") ;; lisp example from Jari Aalto <jaalto@tre.tele.nokia.fi> (defconst expand-sample-lisp-mode-expand-list @@ -181,7 +181,7 @@ (list 12 14)) ) - "Expansions for Lisp mode. See `expand-add-abbrevs'.") + "Expansions for Lisp mode. See `expand-add-abbrevs'.") ;; perl example from Jari Aalto <jaalto@tre.tele.nokia.fi> (defconst expand-sample-perl-mode-expand-list @@ -257,20 +257,20 @@ (list "rtu" "return ;" (list 8)) ) - "Expansions for Perl mode. See `expand-add-abbrevs'.") + "Expansions for Perl mode. See `expand-add-abbrevs'.") ;;; Code: ;;;###autoload (defun expand-add-abbrevs (table abbrevs) - "Add a list of abbrev to abbrev table TABLE. + "Add a list of abbreviations to abbrev table TABLE. ABBREVS is a list of abbrev definitions; each abbrev description entry has the form (ABBREV EXPANSION ARG). ABBREV is the abbreviation to replace. EXPANSION is the replacement string or a function which will make the -expansion. For example you, could use the DMacros or skeleton packages +expansion. For example, you could use the DMacros or skeleton packages to generate such functions. ARG is an optional argument which can be a number or a list of @@ -279,7 +279,7 @@ beginning of the expanded text. If ARG is a list of numbers, point is placed according to the first member of the list, but you can visit the other specified positions -cyclicaly with the functions `expand-jump-to-previous-slot' and +cyclically with the functions `expand-jump-to-previous-slot' and `expand-jump-to-next-slot'. If ARG is omitted, point is placed at the end of the expanded text." @@ -293,18 +293,15 @@ If ARG is omitted, point is placed at the end of the expanded text." (defvar expand-list nil "Temporary variable used by the Expand package.") (defvar expand-pos nil - "If non-nil, stores a vector containing markers to positions defined by the last expansion. -This variable is local to a buffer.") + "If non-nil, stores a vector containing markers to positions defined by the last expansion.") (make-variable-buffer-local 'expand-pos) (defvar expand-index 0 - "Index of the last marker used in `expand-pos'. -This variable is local to a buffer.") + "Index of the last marker used in `expand-pos'.") (make-variable-buffer-local 'expand-index) (defvar expand-point nil - "End of the expanded region. -This variable is local to a buffer.") + "End of the expanded region.") (make-variable-buffer-local 'expand-point) (defun expand-add-abbrev (table abbrev expansion arg) diff --git a/lisp/ezimage.el b/lisp/ezimage.el index b828f79f8fa..a3562944039 100644 --- a/lisp/ezimage.el +++ b/lisp/ezimage.el @@ -59,7 +59,7 @@ IMAGESPEC is the image data, and DOCSTRING is documentation for the image." (defimage ,variable ,imagespec ,docstring) (put (quote ,variable) 'ezimage t))) -;; This hack is for the ezimage install which has an icons direcory for +;; This hack is for the ezimage install which has an icons directory for ;; the default icons to be used. ;; (add-to-list 'load-path ;; (concat (file-name-directory @@ -257,9 +257,9 @@ Optional argument STRING is a string upon which to add text properties." (a (assoc bt ezimage-expand-image-button-alist))) ;; Regular images (created with `insert-image' are intangible ;; which (I suppose) make them more compatible with XEmacs 21. - ;; Unfortunatly, there is a giant pile o code dependent on the + ;; Unfortunately, there is a giant pile of code dependent on the ;; underlying text. This means if we leave it tangible, then I - ;; don't have to change said giant piles o code. + ;; don't have to change said giant piles of code. (if (and a (symbol-value (cdr a))) (ezimage-insert-over-text (symbol-value (cdr a)) start diff --git a/lisp/faces.el b/lisp/faces.el index 45173eb35da..7bc103ca699 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2457,7 +2457,7 @@ It is used for characters of no fonts too." ;;; Manipulating font names. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; This is here for compatibilty with Emacs 20.2. For example, +;; This is here for compatibility with Emacs 20.2. For example, ;; international/fontset.el uses x-resolve-font-name. The following ;; functions are not used in the face implementation itself. diff --git a/lisp/ffap.el b/lisp/ffap.el index 97105ed422b..74df9883324 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -523,7 +523,7 @@ The optional NOMODIFY argument suppresses the extra search." ;; (ffap-file-remote-p "/ffap.el:80") (or (and ffap-ftp-regexp (string-match ffap-ftp-regexp filename) - ;; Convert "/host.com://dir" to "/host:/dir", to handle a dieing + ;; Convert "/host.com://dir" to "/host:/dir", to handle a dying ;; practice of advertising ftp files as "host.dom://filename". (if (string-match "//" filename) ;; (replace-match "/" nil nil filename) diff --git a/lisp/files-x.el b/lisp/files-x.el index a6320b32e50..ca847097184 100644 --- a/lisp/files-x.el +++ b/lisp/files-x.el @@ -149,7 +149,7 @@ from the Local Variables list ignoring the input argument VALUE." (goto-char (point-max)) (let ((comment-style 'plain) - (comment-start (or comment-start ";;; "))) + (comment-start (or comment-start ";; "))) (comment-region (prog1 (setq beg (point)) (insert "\nLocal Variables:\nEnd:\n")) diff --git a/lisp/files.el b/lisp/files.el index 40e2df14c1b..6cf94a89c92 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1343,7 +1343,7 @@ automatically choosing a major mode, use \\[find-file-literally]." (let ((value (find-file-noselect filename nil nil wildcards))) (if (listp value) (mapcar 'switch-to-buffer (nreverse value)) - (switch-to-buffer value)))) + (switch-to-buffer value nil 'force-same-window)))) (defun find-file-other-window (filename &optional wildcards) "Edit file FILENAME, in another window. @@ -2603,7 +2603,7 @@ we don't actually set it to the same mode the buffer already has." (if (looking-at auto-mode-interpreter-regexp) (match-string 2) "")) - ;; Map interpreter name to a mode, signalling we're done at the + ;; Map interpreter name to a mode, signaling we're done at the ;; same time. done (assoc (file-name-nondirectory mode) interpreter-mode-alist)) @@ -4686,7 +4686,15 @@ prints a message in the minibuffer. Instead, use `set-buffer-modified-p'." "Change whether this buffer is read-only. With prefix argument ARG, make the buffer read-only if ARG is positive, otherwise make it writable. If buffer is read-only -and `view-read-only' is non-nil, enter view mode." +and `view-read-only' is non-nil, enter view mode. + +This function is usually the wrong thing to use in a Lisp program. +It can have side-effects beyond changing the read-only status of a buffer +\(e.g., enabling view mode), and does not affect read-only regions that +are caused by text properties. To make a buffer read-only in Lisp code, +set `buffer-read-only'. To ignore read-only status (whether due to text +properties or buffer state) and make changes, temporarily bind +`inhibit-read-only'." (interactive "P") (if (and arg (if (> (prefix-numeric-value arg) 0) buffer-read-only @@ -6492,7 +6500,7 @@ Otherwise, trash FILENAME using the freedesktop.org conventions, (setq tries 0 success t)) (file-already-exists nil)) (setq tries (1- tries)) - ;; Uniqify new-fn. (Some file managers do not + ;; Uniquify new-fn. (Some file managers do not ;; like Emacs-style backup file names---e.g. bug ;; 170956 in Konqueror bug tracker.) (setq new-fn (make-temp-name (concat base-fn "_"))))) diff --git a/lisp/follow.el b/lisp/follow.el index b387427a47f..92efc8d8cfa 100644 --- a/lisp/follow.el +++ b/lisp/follow.el @@ -118,7 +118,7 @@ ;; (setq pixel-vertical-clip-threshold 30) -;; The correct way to configurate Follow mode, or any other mode for +;; The correct way to configure Follow mode, or any other mode for ;; that matter, is to create one or more functions that do ;; whatever you would like to do. These functions are then added to ;; a hook. @@ -560,7 +560,7 @@ Keys specific to Follow mode: ;; `scroll-up' and `-down', but for windows in Follow mode. ;; -;; Almost like the real thing, excpet when the cursor ends up outside +;; Almost like the real thing, except when the cursor ends up outside ;; the top or bottom... In our case however, we end up outside the ;; window and hence we are recenterd. Should we let `recenter' handle ;; the point position we would never leave the selected window. To do @@ -652,7 +652,7 @@ the rightmost is selected. If ARG is nil, the leftmost window is selected if the original window is the first one in the frame. To bind this command to a hotkey, place the following line -in your `~/.emacs' file, replacing [f7] by your favourite key: +in your `~/.emacs' file, replacing [f7] by your favorite key: (global-set-key [f7] 'follow-delete-other-windows-and-split)" (interactive "P") (let ((other (or (and (null arg) @@ -894,7 +894,7 @@ Returns (end-pos end-of-buffer-p)" (save-restriction ;; Fix a mis-feature in `vertical-motion': ;; The start of the window is assumed to - ;; coinside with the start of a line. + ;; coincide with the start of a line. (narrow-to-region (point) (point-max)) (not (= height (vertical-motion height)))))) (list (point) buffer-end-p)))))) @@ -1064,7 +1064,7 @@ Return the selected window." ;; it wasn't just moved here. (I.e. M-> shall not unconditionally place ;; the point in the selected window.) ;; -;; (Compatibility cludge: in Emacs `window-end' is equal to `point-max'; +;; (Compatibility kludge: in Emacs `window-end' is equal to `point-max'; ;; in XEmacs, it is equal to `point-max + 1'. Should I really bother ;; checking `window-end' now when I check `end-of-buffer' explicitly?) diff --git a/lisp/font-lock.el b/lisp/font-lock.el index 2f4b7413dcc..d410b8eb51a 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -1742,7 +1742,7 @@ If SYNTACTIC-KEYWORDS is non-nil, it means these keywords are used for keyword))) (defun font-lock-eval-keywords (keywords) - "Evalulate KEYWORDS if a function (funcall) or variable (eval) name." + "Evaluate KEYWORDS if a function (funcall) or variable (eval) name." (if (listp keywords) keywords (font-lock-eval-keywords (if (fboundp keywords) diff --git a/lisp/frame.el b/lisp/frame.el index 8359fed14a4..f63179de1f1 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1299,7 +1299,7 @@ Each element of the alist has the form (display . (width . height)), e.g. (\":0.0\" . (287 . 215)). If `display' equals t, it specifies dimensions for all graphical -displays not explicitely specified." +displays not explicitly specified." :version "22.1" :type '(alist :key-type (choice (string :tag "Display name") (const :tag "Default" t)) diff --git a/lisp/generic-x.el b/lisp/generic-x.el index 5205a6811f6..b0ef0439404 100644 --- a/lisp/generic-x.el +++ b/lisp/generic-x.el @@ -1436,7 +1436,7 @@ like an INI file. You can add this hook to `find-file-hook'." "REGDB_APPPATH" "REGDB_BINARY" "REGDB_ERR_CONNECTIONEXISTS" - "REGDB_ERR_CORRUPTEDREGSITRY" + "REGDB_ERR_CORRUPTEDREGISTRY" "REGDB_ERR_INITIALIZATION" "REGDB_ERR_INVALIDHANDLE" "REGDB_ERR_INVALIDNAME" @@ -1446,7 +1446,7 @@ like an INI file. You can add this hook to `find-file-hook'." "REGDB_STRING" "REGDB_UNINSTALL_NAME" "REMOTE_DRIVE" - "REMOVALE_DRIVE" + "REMOVEABLE_DRIVE" "REPLACE_ITEM" "REPLACE" "RESET" diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a208ccefd4c..5e25d01da71 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,44 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * gnus-sum.el (gnus-summary-make-menu-bar): + * gnus-uu.el (gnus-uu-decode-postscript) + (gnus-uu-decode-postscript-and-save): + * mailcap.el (mailcap-print-command): + * registry.el (registry-lookup, registry-lookup-breaks-before-lexbind): + Fix typos. + +2011-11-15 Juanma Barranquero <lekktu@gmail.com> + + * gnus-art.el (gnus-article-part-wrapper): + * shr-color.el (shr-color-visible-distance-min) + (shr-color-relative-to-absolute, set-minimum-interval) + (shr-color-visible): Fix typos. + +2011-11-03 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * gnus-sum.el (gnus-articles-to-read): Change wording in prompt to be + slightly clearer. + +2011-11-03 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * message.el (message-send-and-exit): Document `arg'. + +2011-11-03 Stefan Monnier <monnier@iro.umontreal.ca> + + * nnimap.el (nnimap-open-connection-1): Use tcp-keealive if possible. + +2011-11-02 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-util.el (gnus-bound-and-true-p): Another comment to explain why + we don't use `bound-and-true-p'. + +2011-11-01 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-util.el (gnus-bound-and-true-p): Remove. + (gnus-bound-and-true-dumber-p): Rename to `gnus-bound-and-true-p'. + * nnir.el: Use it. + * nnmairix.el: Use it. + 2011-10-31 Teodor Zlatanov <tzz@lifelogs.com> * gnus-util.el (gnus-bound-and-true-dumber-p): Define new, slower, dumb @@ -1795,7 +1836,7 @@ 2011-03-15 Lars Magne Ingebrigtsen <larsi@gnus.org> - * gnus-sum.el (gnus-articles-to-read): Revert back to old behaviour if + * gnus-sum.el (gnus-articles-to-read): Revert back to old behavior if we're selecting a group with unread articles. * nnimap.el (nnimap-open-connection-1): Allow `network-only', too. @@ -2534,7 +2575,7 @@ * gnus-sum.el (gnus-user-date): Rename back from gnus-summary-user-date since user code refers to it. - * shr.el (shr-render-td): Store the actual background colour used. + * shr.el (shr-render-td): Store the actual background color used. * message.el (message-setup-1): Don't bind the constant -forbidden-properties. @@ -2622,9 +2663,9 @@ 2011-02-01 Lars Ingebrigtsen <larsi@gnus.org> - * shr.el (shr-render-td): Only do colours at the final rendering. + * shr.el (shr-render-td): Only do colors at the final rendering. Should be slightly faster. - (shr-insert-table): Fix up TD background colours when doing the + (shr-insert-table): Fix up TD background colors when doing the vertical padding. * gnus-art.el (article-date-ut): Protect against articles with no Date @@ -2752,7 +2793,7 @@ 2011-01-27 Lars Ingebrigtsen <larsi@gnus.org> - * shr.el (shr-put-color): Special-case background colours: Do put them + * shr.el (shr-put-color): Special-case background colors: Do put them at the blank parts at the front of the lines. * gnus-draft.el (gnus-draft-clear-marks): New function to be run as an @@ -3757,7 +3798,7 @@ 2010-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org> - * shr-color.el (shr-color-visible): Don't bug out if the colour names + * shr-color.el (shr-color-visible): Don't bug out if the color names don't exist. 2010-11-25 Katsumi Yamaoka <yamaoka@jpl.org> @@ -3829,7 +3870,7 @@ 2010-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org> - * shr.el (shr-color-check): Protect against non-existent colour names. + * shr.el (shr-color-check): Protect against non-existent color names. 2010-11-24 Julien Danjou <julien@danjou.info> @@ -3855,7 +3896,7 @@ 2010-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org> * shr.el (shr-insert-color-overlay): Split stuff like - "#444444 !important" to find the real colour. + "#444444 !important" to find the real color. (shr-tag-font): Resurrect shr-tag-font again, since it's needed to parse <font color="red"> entries. @@ -4397,7 +4438,7 @@ gnus-original-article-buffer is alive. * nndoc.el (nndoc-dissect-buffer): Reverse the order of the articles to - reflect the order they're in in the digest. + reflect the order they are in the digest. * gnus.el (gnus-group-startup-message): Move point to the start of the buffer. @@ -4532,7 +4573,7 @@ * shr.el (shr-put-image): Use point even if only inserting text. (shr-put-image): Save excursion when inserting alt text on non-graphic - display, so the behaviour is the same when we are on a graphic display. + display, so the behavior is the same when we are on a graphic display. * nnir.el (nnir-run-swish-e): Remove hyrex support. @@ -5153,7 +5194,7 @@ bidning gnus-agent variables. * shr.el (shr-render-td): Use a cache for the table rendering function - to avoid getting an exponential rendering behaviour in nested tables. + to avoid getting an exponential rendering behavior in nested tables. (shr-insert): Rework the line-breaking algorithm. (shr-insert): Don't leave trailing spaces. (shr-insert-table): Also insert empty TDs. @@ -5966,15 +6007,15 @@ highlight again, so that the highlight is correct. * gnus-picon.el (gnus-picon): Remove again. - (gnus-picon-create-glyph): Set the background XPM colour explicitly. + (gnus-picon-create-glyph): Set the background XPM color explicitly. * gnus-art.el (gnus-treatment-function-alist): Insert picons after - doing the header highlightling, so that the background colour of the + doing the header highlightling, so that the background color of the picon is correct. * gnus-picon.el (gnus-picon-xbm): Remove obsolete face. (gnus-picon): Ditto. - (gnus-picon): Reinstate. The background colour for picons is white. + (gnus-picon): Reinstate. The background color for picons is white. (gnus-picon-insert-glyph): Make the background white. * nnml.el (nnml-open-nov): Don't return dead buffers. @@ -6758,7 +6799,7 @@ * gnus-start.el (gnus-get-unread-articles): Allow the backends to update the group info. This makes the nndraft groups, for instance, go - back to their old behaviour. + back to their old behavior. * gnus-sum.el (gnus-select-newsgroup): Indent. @@ -7150,7 +7191,7 @@ * gnus-agent.el (gnus-agent-auto-agentize-methods): Change the default so that nnimap methods aren't agentized by default. There's apparently - many problems related to agent/imap behaviour. + many problems related to agent/imap behavior. * gnus-art.el (gnus-article-copy-string): New command and key binding. @@ -7195,7 +7236,7 @@ storage than before. * gnus.el (gnus-refer-article-method): Change default to 'current. - When referring an article, the common behaviour is to refer it from the + When referring an article, the common behavior is to refer it from the current select method, not the native select method. The chances of the native select method having the message in question is rather slim these days. @@ -7211,7 +7252,7 @@ * gnus-sum.el (gnus-summary-goto-unread): Change default to nil, so that commands like `d' (and the like) go to the next line in the buffer, instead of the next unread article. I think this is the - behaviour that is most natural for most users. + behavior that is most natural for most users. (gnus-single-article-buffer): Change default to nil, so that people can have as many article buffers open as they have summary buffer. I think this is the most natural way for the groups to behave. @@ -7386,7 +7427,7 @@ UTF-8. This seems to fix problems with some German web feeds. * gnus.el (gnus-group-startup-message): Put the xpm version of the logo - at the top so that the proper colours are applied. + at the top so that the proper colors are applied. * gnus-art.el (gnus-article-view-part): Doc fix. @@ -16492,7 +16533,7 @@ 2005-06-16 Arne Jørgensen <arne@arnested.dk> * smime.el (smime-cert-by-ldap-1): Detect PEM format without - header by looking for magic "MII" at the beginnig. + header by looking for magic "MII" at the beginning. 2005-06-16 Miles Bader <miles@gnu.org> @@ -18466,7 +18507,7 @@ 2004-10-05 Jesper Harder <harder@ifa.au.dk> * nnsoup.el (nnsoup-read-active-file): Use dolist, mapc or last - where approriate. + where appropriate. * nnml.el (nnml-generate-active-info): do. @@ -20021,7 +20062,7 @@ * mail-source.el (mail-source-delete-crash-box): Refactor. (mail-source-fetch): Use it. (mail-source-fetch-file): Ditto. - (mail-source-fetch-directory): Run postscript in loop. + (mail-source-fetch-directory): Run PostScript in loop. (mail-source-fetch-pop): Delete. (mail-source-fetch-maildir): Ditto. (mail-source-fetch-imap): Ditto. diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1 index 7448808b20f..86c4eea59ab 100644 --- a/lisp/gnus/ChangeLog.1 +++ b/lisp/gnus/ChangeLog.1 @@ -1336,7 +1336,7 @@ 1998-05-07 Hrvoje Niksic <hniksic@srce.hr> - * nnmail.el: (nnmail-get-split-group): Use `regexp-quote' + * nnmail.el (nnmail-get-split-group): Use `regexp-quote' when file name is a part of pattern. * nnmail.el (nnmail-crosspost-link-function): Ditto. @@ -2540,7 +2540,7 @@ `gnus-simplify-ignored-prefixes'. (gnus-summary-set-display-table): Keep TAB. -1998-01-15 <Use-Author-Address-Header@[127.1]> +1998-01-15 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> * gnus-art.el (gnus-request-article-this-buffer): Put it into the backlog. diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index 779c84296f4..e52f898b184 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -5562,7 +5562,7 @@ 2003-01-14 Kevin Greiner <kgreiner@xpediantsolutions.com> * gnus-agent.el (gnus-agent-get-undownloaded-list): Include the - fictious headers generated by nnagent (ie. Undownloaded Article + fictitious headers generated by nnagent (ie. Undownloaded Article ####) in the list of articles that have not been downloaded. * gnus-int.el (): Added require declarations to resolve diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index 8deb27379a3..f913ddb5378 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -140,7 +140,7 @@ This is a copy of the `lazy' widget in Emacs 22.1 provided for compatibility." ;; :mouse-2 command-on-mouse-2-press ;; :mouse-3 command-on-mouse-3-press) ;; typically a menu of related commands ;; -;; Combinations of mouse-[23] plus shift and/or controll might be overkill. +;; Combinations of mouse-[23] plus shift and/or control might be overkill. ;; ;; Then use (plist-get rs-command :none), (plist-get rs-command :shift) diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el index 669f9675536..71f8cf82d39 100644 --- a/lisp/gnus/gnus-agent.el +++ b/lisp/gnus/gnus-agent.el @@ -1130,7 +1130,7 @@ article's mark is toggled." (setq alist (cdr alist))) ((> a h) ;; Headers that are not in the alist should be - ;; fictious (see nnagent-retrieve-headers); they + ;; fictitious (see nnagent-retrieve-headers); they ;; imply that this article isn't in the agent. (gnus-agent-append-to-list tail-undownloaded h) (gnus-agent-append-to-list tail-unfetched h) @@ -3613,7 +3613,7 @@ articles in every agentized group? ")) (setq r d d (directory-file-name d))) ;; if ANY ancestor was NOT in keep hash and - ;; it it's already in to-remove, add it to + ;; it's already in to-remove, add it to ;; to-remove. (if (and r (not (member r to-remove))) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 0068fbad6e2..dd41947a2af 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -535,7 +535,7 @@ that the symbol of the saver function, which is specified by ;; Note that "Rmail format" is mbox since Emacs 23, but Babyl before. (defcustom gnus-default-article-saver 'gnus-summary-save-in-rmail - "A function to save articles in your favourite format. + "A function to save articles in your favorite format. The function will be called by way of the `gnus-summary-save-article' command, and friends such as `gnus-summary-save-article-rmail'. @@ -1559,7 +1559,7 @@ node `(gnus)Gravatars' for details." gnus-treat-from-picon gnus-treat-from-gravatar gnus-treat-mail-gravatar) - ;; If there's much decoration, the user might prefer a boundery. + ;; If there's much decoration, the user might prefer a boundary. 'head nil) "Draw a boundary at the end of the headers. @@ -5418,8 +5418,8 @@ If no internal viewer is available, use an external viewer." (defun gnus-article-part-wrapper (n function &optional no-handle interactive) "Call FUNCTION on MIME part N. -Unless NO-HANDLE, call FUNCTION with N-th MIME handle as it's only argument. -If INTERACTIVE, call FUNCTION interactivly." +Unless NO-HANDLE, call FUNCTION with N-th MIME handle as its only argument. +If INTERACTIVE, call FUNCTION interactively." (let (window frame) ;; Check whether the article is displayed. (unless (and (gnus-buffer-live-p gnus-article-buffer) diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el index 0b5a7ebf1f9..9f86e74bd99 100644 --- a/lisp/gnus/gnus-diary.el +++ b/lisp/gnus/gnus-diary.el @@ -157,7 +157,7 @@ There are currently two built-in format functions: ;; I just ignore it. ;;;###autoload (defun gnus-user-format-function-d (header) - ;; Returns an aproximative delay string for the next occurrence of this + ;; Return an approximate delay string for the next occurrence of this ;; message. The delay is given only in the first non zero unit. ;; Code partly stolen from article-make-date-line (let* ((extras (mail-header-extra header)) diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index ec98b2ff749..2d8587ace3f 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -553,7 +553,7 @@ The following commands are available: (gnus-server-list-servers)) (defun gnus-server-copy-server (from to) - "Copy a server definiton to a new name." + "Copy a server definition to a new name." (interactive (list (or (gnus-server-server-name) diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el index 7c63d5e2653..b18b78df063 100644 --- a/lisp/gnus/gnus-start.el +++ b/lisp/gnus/gnus-start.el @@ -1678,7 +1678,7 @@ If SCAN, request a scan of that group as well." ;; Sort the methods based so that the primary and secondary ;; methods come first. This is done for legacy reasons to try to - ;; ensure that side-effect behaviour doesn't change from previous + ;; ensure that side-effect behavior doesn't change from previous ;; Gnus versions. (setq type-cache (sort (nreverse type-cache) diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 66b661884e9..5380595eadb 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -364,7 +364,7 @@ newsgroups, set the variable to nil in `gnus-select-group-hook'." This variable can either be the symbols `first' (place point on the first subject), `unread' (place point on the subject line of the first unread article), `best' (place point on the subject line of the -higest-scored article), `unseen' (place point on the subject line of +highest-scored article), `unseen' (place point on the subject line of the first unseen article), `unseen-or-unread' (place point on the subject line of the first unseen article or, if all articles have been seen, on the subject line of the first unread article), or a function to be called to @@ -2529,7 +2529,7 @@ gnus-summary-show-article-from-menu-as-charset-%s" cs)))) ["Unshar and save" gnus-uu-decode-unshar-and-save t] ["Save" gnus-uu-decode-save t] ["Binhex" gnus-uu-decode-binhex t] - ["Postscript" gnus-uu-decode-postscript t] + ["PostScript" gnus-uu-decode-postscript t] ["All MIME parts" gnus-summary-save-parts t]) ("Cache" ["Enter article" gnus-cache-enter-article t] @@ -4727,7 +4727,7 @@ If LINE, insert the rebuilt thread starting on line LINE." (car headers)))) (defun gnus-parent-headers (in-headers &optional generation) - "Return the headers of the GENERATIONeth parent of HEADERS." + "Return the headers of the GENERATIONth parent of HEADERS." (unless generation (setq generation 1)) (let ((parent t) @@ -5859,15 +5859,15 @@ If SELECT-ARTICLES, only select those articles from GROUP." (read-string (if only-read-p (format - "How many articles from %s (available %d, default %d): " - (gnus-group-decoded-name - (gnus-group-real-name gnus-newsgroup-name)) - number default) - (format - "How many articles from %s (%d available): " + "How many articles from %s (available %d, default %d): " (gnus-group-decoded-name (gnus-group-real-name gnus-newsgroup-name)) - default)) + number default) + (format + "How many articles from %s (%d default): " + (gnus-group-decoded-name + (gnus-group-real-name gnus-newsgroup-name)) + default)) nil nil (number-to-string default)))) diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el index f1a2ed43e26..17af1a38333 100644 --- a/lisp/gnus/gnus-topic.el +++ b/lisp/gnus/gnus-topic.el @@ -430,7 +430,7 @@ inheritance." regexp list-topic topic-level) "List all newsgroups with unread articles of level LEVEL or lower. Use the `gnus-group-topics' to sort the groups. -If PREDICTE is a function, list groups that the function returns non-nil; +If PREDICATE is a function, list groups that the function returns non-nil; if it is t, list groups that have no unread articles. If LOWEST is non-nil, list all newsgroups of level LOWEST or higher." (set-buffer gnus-group-buffer) diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 71ed50591ad..14551737837 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1986,15 +1986,9 @@ definitions to shadow the loaded ones for use in file byte-compilation." (gnus-macroexpand-all expanded environment))) form)))) -(eval-when-compile - ;; This is unnecessary in the compiled version as it is a macro. - (if (fboundp 'bound-and-true-p) - (defalias 'gnus-bound-and-true-p 'bound-and-true-p) - (defmacro gnus-bound-and-true-p (var) - "Return the value of symbol VAR if it is bound, else nil." - `(and (boundp (quote ,var)) ,var)))) - -(defun gnus-bound-and-true-dumber-p (sym) +;; Simple check: can be a macro but this way, although slow, it's really clear. +;; We don't use `bound-and-true-p' because it's not in XEmacs. +(defun gnus-bound-and-true-p (sym) (and (boundp sym) (symbol-value sym))) (provide 'gnus-util) diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el index 15c3d41bece..50a33809946 100644 --- a/lisp/gnus/gnus-uu.el +++ b/lisp/gnus/gnus-uu.el @@ -41,7 +41,7 @@ :group 'gnus) (defgroup gnus-extract-view nil - "Viewwing extracted files." + "Viewing extracted files." :group 'gnus-extract) (defgroup gnus-extract-archive nil @@ -727,7 +727,7 @@ When called interactively, prompt for REGEXP." ;; All PostScript functions written by Erik Selberg <speed@cs.washington.edu>. (defun gnus-uu-decode-postscript (&optional n) - "Gets postscript of the current article." + "Gets PostScript of the current article." (interactive "P") (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article n)) @@ -738,7 +738,7 @@ When called interactively, prompt for REGEXP." (gnus-uu-decode-postscript n))) (defun gnus-uu-decode-postscript-and-save (n dir) - "Extracts postscript and saves the current article." + "Extracts PostScript and saves the current article." (interactive (list current-prefix-arg (file-name-as-directory diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el index a1a8abc3086..ecd5b3b525b 100644 --- a/lisp/gnus/gnus-win.el +++ b/lisp/gnus/gnus-win.el @@ -54,7 +54,7 @@ :type 'boolean) (defcustom gnus-use-frames-on-any-display nil - "*If non-nil, frames on all displays will be considered useable by Gnus. + "*If non-nil, frames on all displays will be considered usable by Gnus. When nil, only frames on the same display as the selected frame will be used to display Gnus windows." :version "22.1" diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 924d974eb3c..5f385ec1054 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -3582,7 +3582,7 @@ that that variable is buffer-local to the summary buffers." (equal (nth 1 m1) (nth 1 m2))))))) (defsubst gnus-sloppily-equal-method-parameters (m1 m2) - ;; Check parameters for sloppy equalness. + ;; Check parameters for sloppy equality. (let ((p1 (copy-sequence (cddr m1))) (p2 (copy-sequence (cddr m2))) e1 e2) diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el index 8cfd9b9f903..dade86ab174 100644 --- a/lisp/gnus/html2text.el +++ b/lisp/gnus/html2text.el @@ -123,7 +123,7 @@ If this list contains the element \"font\".") This is an alist where each dotted pair consists of a tag, and then the name of a function to be called when this tag is found. The function is called with the arguments p1, p2, p3 and p4. These are -demontrated below: +demonstrated below: \"<b> This is bold text </b>\" ^ ^ ^ ^ @@ -410,7 +410,7 @@ fashion, quite close to pure guess-work. It does work in some cases though." (while (re-search-forward "^<br>$" nil t) (delete-region (match-beginning 0) (match-end 0))) ;; Removing lonely <br> on a single line, if they are left intact we - ;; dont have any paragraphs at all. + ;; don't have any paragraphs at all. (goto-char (point-min)) (while (not (eobp)) (let ((p1 (point))) diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el index 7959104d646..cbfa05bb87d 100644 --- a/lisp/gnus/mailcap.el +++ b/lisp/gnus/mailcap.el @@ -82,7 +82,7 @@ This is a compatibility function for different Emacsen." (list lpr-switches) lpr-switches))) " ") - "Shell command (including switches) used to print Postscript files.") + "Shell command (including switches) used to print PostScript files.") ;; Postpone using defcustom for this as it's so big and we essentially ;; have to have two copies of the data around then. Perhaps just diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el index 723f8fb72b5..176857633e1 100644 --- a/lisp/gnus/message.el +++ b/lisp/gnus/message.el @@ -2503,7 +2503,7 @@ Return the number of headers removed." (point-max))) (goto-char (point-min))) -;; FIXME: clarify diffference: message-narrow-to-head, +;; FIXME: clarify difference: message-narrow-to-head, ;; message-narrow-to-headers-or-head, message-narrow-to-headers (defun message-narrow-to-head () "Narrow the buffer to the head of the message. @@ -4022,7 +4022,9 @@ The text will also be indented the normal way." ;;; (defun message-send-and-exit (&optional arg) - "Send message like `message-send', then, if no errors, exit from mail buffer." + "Send message like `message-send', then, if no errors, exit from mail buffer. +The usage of ARG is defined by the instance that called Message. +It should typically alter the sending method in some way or other." (interactive "P") (let ((buf (current-buffer)) (actions message-exit-actions)) diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el index 37ee59e9b4b..36c56e0921b 100644 --- a/lisp/gnus/mm-decode.el +++ b/lisp/gnus/mm-decode.el @@ -1494,7 +1494,7 @@ be determined." (or (not image) (if (featurep 'xemacs) ;; XEmacs' glyphs can actually tell us about their width, so - ;; lets be nice and smart about them. + ;; let's be nice and smart about them. (or mm-inline-large-images (and (<= (glyph-width image) (window-pixel-width)) (<= (glyph-height image) (window-pixel-height)))) diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el index db7ac1b44f8..a798e22902f 100644 --- a/lisp/gnus/nndiary.el +++ b/lisp/gnus/nndiary.el @@ -72,7 +72,7 @@ ;; * nndiary-get-new-mail, nndiary-mail-source and nndiary-split-methods: ;; NNDiary has some experimental parts, in the sense Gnus normally uses only ;; one mail back ends for mail retreival and splitting. This back end is -;; also an attempt to make it behave differently. For Gnus developpers: as +;; also an attempt to make it behave differently. For Gnus developers: as ;; you can see if you snarf into the code, that was not a very difficult ;; thing to do. Something should be done about the respooling breakage ;; though. diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 77372c246cb..cda17ba57c6 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -397,6 +397,14 @@ textual parts.") (stream-type (plist-get props :type))) (when (and stream (not (memq (process-status stream) '(open run)))) (setq stream nil)) + + (when (and (fboundp 'set-network-process-option) ;; Not in XEmacs. + (fboundp 'process-type) ;; Emacs 22 doesn't provide it. + (eq (process-type stream) 'network)) + ;; Use TCP-keepalive so that connections that pass through a NAT + ;; router don't hang when left idle. + (set-network-process-option stream :keepalive t)) + (setf (nnimap-process nnimap-object) stream) (setf (nnimap-stream-type nnimap-object) stream-type) (if (not stream) diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 7087f8dba96..88fd4fe1ff6 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -1739,7 +1739,7 @@ environment unless `not-global' is non-nil." (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir) (setq gnus-summary-line-format (or nnir-summary-line-format gnus-summary-line-format)) - (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled) + (when (gnus-bound-and-true-p 'gnus-registry-enabled) (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t) diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 0e58af73666..9d6011e6573 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -1634,8 +1634,8 @@ search in raw mode." (nnheader-message 3 "Couldn't find original article")))) (defun nnmairix-determine-original-group-from-registry (mid) - "Try to determinale original group for message-id MID from the registry." - (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled) + "Try to determine original group for message-id MID from the registry." + (when (gnus-bound-and-true-p 'gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) (unless (string-match ">$" mid) diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el index 8e158f7ca0f..5fd309a5c7d 100644 --- a/lisp/gnus/registry.el +++ b/lisp/gnus/registry.el @@ -149,7 +149,7 @@ (defmethod registry-lookup ((db registry-db) keys) "Search for KEYS in the registry-db THIS. -Returns a alist of the key followed by the entry in a list, not a cons cell." +Returns an alist of the key followed by the entry in a list, not a cons cell." (let ((data (oref db :data))) (delq nil (mapcar @@ -160,7 +160,7 @@ Returns a alist of the key followed by the entry in a list, not a cons cell." (defmethod registry-lookup-breaks-before-lexbind ((db registry-db) keys) "Search for KEYS in the registry-db THIS. -Returns a alist of the key followed by the entry in a list, not a cons cell." +Returns an alist of the key followed by the entry in a list, not a cons cell." (let ((data (oref db :data))) (delq nil (loop for key in keys diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index e82192b91d6..feed078034c 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -285,11 +285,11 @@ Should be called narrowed to the head of the message." mail-parse-charset) (mm-encode-coding-region (point) (point-max) mail-parse-charset))) - ;; We get this when CC'ing messsages to newsgroups with + ;; We get this when CC'ing messages to newsgroups with ;; 8-bit names. The group name mail copy just got ;; unconditionally encoded. Previously, it would ask ;; whether to encode, which was quite confusing for the - ;; user. If the new behavior is wrong, tell me. I have + ;; user. If the new behavior is wrong, tell me. I have ;; left the old code commented out below. ;; -- Per Abrahamsen <abraham@dina.kvl.dk> Date: 2001-10-07. ;; Modified by Dave Love, with the commented-out code changed diff --git a/lisp/gnus/shr-color.el b/lisp/gnus/shr-color.el index 36dd65f4a2d..4fd35659e08 100644 --- a/lisp/gnus/shr-color.el +++ b/lisp/gnus/shr-color.el @@ -41,7 +41,7 @@ Must be between 0 and 100." (defcustom shr-color-visible-distance-min 5 "Minimum color distance between two colors to be considered visible. -This value is used to compare result for `ciede2000'. Its an +This value is used to compare result for `ciede2000'. It's an absolute value without any unit." :group 'shr :type 'integer) @@ -198,7 +198,8 @@ absolute value without any unit." Each entry should have the form (COLOR-NAME . HEXADECIMAL-COLOR).") (defun shr-color-relative-to-absolute (number) - "Convert a relative NUMBER to absolute. If NUMBER is absolute, return NUMBER. + "Convert a relative NUMBER to absolute. +If NUMBER is absolute, return NUMBER. This will convert \"80 %\" to 204, \"100 %\" to 255 but \"123\" to \"123\"." (let ((string-length (- (length number) 1))) ;; Is this a number with %? @@ -269,7 +270,7 @@ Like rgb() or hsl()." (defun set-minimum-interval (val1 val2 min max interval &optional fixed) "Set minimum interval between VAL1 and VAL2 to INTERVAL. The values are bound by MIN and MAX. -If FIXED is t, then val1 will not be touched." +If FIXED is t, then VAL1 will not be touched." (let ((diff (abs (- val1 val2)))) (unless (>= diff interval) (if fixed @@ -319,10 +320,10 @@ If FIXED is t, then val1 will not be touched." (defun shr-color-visible (bg fg &optional fixed-background) "Check that BG and FG colors are visible if they are drawn on each other. -Return (bg fg) if they are. If they are too similar, two new +Return (bg fg) if they are. If they are too similar, two new colors are returned instead. If FIXED-BACKGROUND is set, and if the color are not visible, a -new background color will not be computed. Only the foreground +new background color will not be computed. Only the foreground color will be adapted to be visible on BG." ;; Convert fg and bg to CIE Lab (let ((fg-norm (color-name-to-rgb fg)) @@ -334,7 +335,7 @@ color will be adapted to be visible on BG." (bg-lab (apply 'color-srgb-to-lab bg-norm)) ;; Compute color distance using CIE DE 2000 (fg-bg-distance (color-cie-de2000 fg-lab bg-lab)) - ;; Compute luminance distance (substract L component) + ;; Compute luminance distance (subtract L component) (luminance-distance (abs (- (car fg-lab) (car bg-lab))))) (if (and (>= fg-bg-distance shr-color-visible-distance-min) (>= luminance-distance shr-color-visible-luminance-min)) diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el index 2111d34eac5..a44a03b6913 100644 --- a/lisp/gnus/sieve.el +++ b/lisp/gnus/sieve.el @@ -21,7 +21,7 @@ ;;; Commentary: -;; This file contain utilities to facilate upload, download and +;; This file contain utilities to facilitate upload, download and ;; general management of sieve scripts. Currently only the ;; Managesieve protocol is supported (using sieve-manage.el), but when ;; (useful) alternatives become available, they might be supported as diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el index 5a7079883e6..128bda6f516 100644 --- a/lisp/gnus/smime.el +++ b/lisp/gnus/smime.el @@ -588,7 +588,7 @@ A string or a list of strings is returned." (filter &optional host attributes attrsonly withdn)) (defun smime-cert-by-ldap-1 (mail host) - "Get cetificate for MAIL from the ldap server at HOST." + "Get certificate for MAIL from the ldap server at HOST." (let ((ldapresult (funcall (if (featurep 'xemacs) @@ -689,7 +689,7 @@ The following commands are available: (dolist (key smime-keys) (insert (format "\t\t%s: %s\n" (car key) (cadr key)))) - (insert "\nTrusted Certificate Authoritys:\n") + (insert "\nTrusted Certificate Authorities:\n") (insert "\nKnown Certificates:\n")))) (defun smime () diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el index 95b5fb578f4..6c94dbdd2c4 100644 --- a/lisp/gnus/spam-report.el +++ b/lisp/gnus/spam-report.el @@ -102,7 +102,7 @@ Reports is as ham when HAM is set." (customize-set-variable spam-report-resend-to (read-from-minibuffer "email address to resend SPAM/HAM to? "))) - ;; This is ganked from the `gnus-summary-resend-message' function. + ;; This is yanked from the `gnus-summary-resend-message' function. ;; It involves rendering the SPAM, which is undesirable, but there does ;; not seem to be a nicer way to achieve this. ;; select this particular article diff --git a/lisp/help-fns.el b/lisp/help-fns.el index 5e034b14fde..efdc237d11f 100644 --- a/lisp/help-fns.el +++ b/lisp/help-fns.el @@ -256,7 +256,7 @@ if the variable `help-downcase-arguments' is non-nil." ;; so let's skip over it (search-backward "(") (goto-char (scan-sexps (point) 1))))) - ;; Highlight aguments in the USAGE string + ;; Highlight arguments in the USAGE string (setq usage (help-do-arg-highlight (buffer-string) args)) ;; Highlight arguments in the DOC string (setq doc (and doc (help-do-arg-highlight doc args)))))) diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 46db4280688..0dee4157d78 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el @@ -480,7 +480,7 @@ This is the opposite of `hilit-chg-hide-changes'." (defun hilit-chg-make-ov (prop start end) (or prop (error "hilit-chg-make-ov: prop is nil")) - ;; For the region create overlays with a distincive face + ;; For the region create overlays with a distinctive face ;; and the text property 'hilit-chg. (let ((ov (make-overlay start end)) (face (if (eq prop 'hilit-chg-delete) diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el index c8e95581510..cd9f1fa6b43 100644 --- a/lisp/htmlfontify.el +++ b/lisp/htmlfontify.el @@ -360,7 +360,7 @@ commands in `hfy-etags-cmd-alist'." :type '(repeat symbol)) (defun hfy-which-etags () - "Return a string indicating which flavour of etags we are using." + "Return a string indicating which flavor of etags we are using." (let ((v (shell-command-to-string (concat hfy-etags-bin " --version")))) (cond ((string-match "exube" v) "exuberant ctags") ((string-match "GNU E" v) "emacs etags" )) )) @@ -432,8 +432,8 @@ and so on." (const :tag "Lucid Toolkit" lucid ) (const :tag "Motif Toolkit" motif ))) - (class (choice (const :tag "Colour" color ) - (const :tag "Greyscale" grayscale))) + (class (choice (const :tag "Color" color ) + (const :tag "Grayscale" grayscale))) (background (choice (const :tag "Dark" dark ) (const :tag "Bright" light ))) )) @@ -586,7 +586,7 @@ If a window system is unavailable, calls `hfy-fallback-colour-values'." (defvar hfy-cperl-mode-kludged-p nil) (defun hfy-kludge-cperl-mode () - "CPerl mode does its damndest not to do some of its fontification when not + "CPerl mode does its damnedest not to do some of its fontification when not in a windowing system - try to trick it..." (if (not hfy-cperl-mode-kludged-p) (progn (if (not window-system) @@ -1768,12 +1768,12 @@ hyperlinks as appropriate." "Return a list of files under DIRECTORY. Strips any leading \"./\" from each filename." ;;(message "hfy-list-files");;DBUG - ;; FIXME: this changes the dir of the currrent buffer. Is that right?? + ;; FIXME: this changes the dir of the current buffer. Is that right?? (cd directory) (mapcar (lambda (F) (if (string-match "^./\\(.*\\)" F) (match-string 1 F) F)) (split-string (shell-command-to-string hfy-find-cmd))) ) -;; strip the filename off, return a directiry name +;; strip the filename off, return a directory name ;; not a particularly thorough implementaion, but it will be ;; fed pretty carefully, so it should be Ok: (defun hfy-dirname (file) diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 17ddddbd17a..3f3b0b7a843 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -2504,7 +2504,7 @@ Other commands: ** Information on Filtering: - You can filter your ibuffer view via different critera. Each Ibuffer + You can filter your ibuffer view via different criteria. Each Ibuffer buffer has its own stack of active filters. For example, suppose you are working on an Emacs Lisp project. You can create an Ibuffer buffer displays buffers in just `emacs-lisp' modes via diff --git a/lisp/ido.el b/lisp/ido.el index fda4c0316f7..6af431a2882 100644 --- a/lisp/ido.el +++ b/lisp/ido.el @@ -258,7 +258,7 @@ ;; The highlighting of matching items is controlled via ido-use-faces. ;; The faces used are ido-first-match, ido-only-match and ;; ido-subdir. -;; Colouring of the matching item was suggested by +;; Coloring of the matching item was suggested by ;; Carsten Dominik (dominik@strw.leidenuniv.nl). ;; Replacement for read-buffer and read-file-name @@ -3152,7 +3152,7 @@ for first matching file." ;;; CREATE LIST OF ALL CURRENT FILES (defun ido-all-completions () - ;; Return unsorted list of all competions. + ;; Return unsorted list of all completions. (let ((ido-process-ignore-lists nil) (ido-directory-too-big nil)) (cond diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 30223e69ae0..f3e7caab174 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -638,7 +638,7 @@ These properties are determined by the Image mode variables `image-transform-resize' and `image-transform-rotation'. The return value is suitable for appending to an image spec. -Recaling and rotation properties only take effect if Emacs is +Rescaling and rotation properties only take effect if Emacs is compiled with ImageMagick support." (when (or image-transform-resize (not (equal image-transform-rotation 0.0))) diff --git a/lisp/info-xref.el b/lisp/info-xref.el index 41da9d12c99..8a5cca18496 100644 --- a/lisp/info-xref.el +++ b/lisp/info-xref.el @@ -313,7 +313,7 @@ should be harmless." (interactive) (info-xref-check-list (info-xref-all-info-files))) -;; An alternative for geting only top-level files here would be to simply +;; An alternative for getting only top-level files here would be to simply ;; return all files and have info-xref-check-list not follow "Indirect:". ;; The current way seems better because it (potentially) gets the proper ;; top-level filename into the error messages, and suppresses duplicate "not diff --git a/lisp/info.el b/lisp/info.el index b8deb3c9c7f..0148ee544f9 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -264,7 +264,7 @@ Before leaving the initial Info node, where isearch was started, it fails once with the error message [initial node], and with subsequent C-s/C-r continues through other nodes without failing with this error message in other nodes. When isearch fails for -the rest of the manual, it wraps aroung the whole manual and +the rest of the manual, it wraps around the whole manual and restarts the search from the top/final node depending on search direction. @@ -3328,7 +3328,7 @@ Return a list of matches where each element is in the format (Info-directory) ;; current-node and current-file are nil when they invoke info-apropos ;; as the first Info command, i.e. info-apropos loads info.el. In that - ;; case, we use (DIR)Top instead, to avoid signalling an error after + ;; case, we use (DIR)Top instead, to avoid signaling an error after ;; the search is complete. (when (null current-node) (setq current-file Info-current-file) diff --git a/lisp/international/characters.el b/lisp/international/characters.el index 47426784e51..94237a0a489 100644 --- a/lisp/international/characters.el +++ b/lisp/international/characters.el @@ -466,7 +466,7 @@ with L, LRE, or LRO Unicode bidi character type.") ;; Tai Viet (let ((deflist '(;; chars syntax category - ((?ꪀ. ?ꪯ) "w" ?0) ; cosonant + ((?ꪀ. ?ꪯ) "w" ?0) ; consonant ("ꪱꪵꪶ" "w" ?1) ; vowel base ((?ꪹ . ?ꪽ) "w" ?1) ; vowel base ("ꪰꪲꪳꪷꪸꪾ" "w" ?2) ; vowel upper diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el index 777779e5ec5..9f6520c7238 100644 --- a/lisp/international/fontset.el +++ b/lisp/international/fontset.el @@ -700,7 +700,7 @@ Internal use only. Should be called at startup time." ;; HPHEBREW8 8-bit character set ;; "HP-Japanese15" [36] ;; HPJAPAN15 15-bit character set, -;; modified from industry defacto +;; modified from industry de facto ;; standard Shift-JIS ;; "HP-Kana8" [36] ;; HPKANA8 8-bit character set diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el index cccf65b8051..efb910a3ef6 100644 --- a/lisp/international/mule-diag.el +++ b/lisp/international/mule-diag.el @@ -958,7 +958,7 @@ the current buffer." (insert "\n ---<fallback to the default of the default fontset>---") (put-text-property (line-beginning-position) (point) 'face 'highlight))) (if (and start1 end2) - ;; Reoder the printed information to match with the font + ;; Reorder the printed information to match with the font ;; searching strategy; i.e. FONTSET, the default fontset, ;; default of FONTSET, default of the default fontset. (transpose-regions start1 end1 start2 end2)) diff --git a/lisp/international/mule.el b/lisp/international/mule.el index cac37b3b8c5..6888056704d 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -120,14 +120,14 @@ MAX-N is the maximum byte value of that. `:min-code' -VALUE must be an integer specifying the mininum code point of the +VALUE must be an integer specifying the minimum code point of the charset. If omitted, it is calculated from `:code-space'. VALUE may be a cons (HIGH . LOW), where HIGH is the most significant 16 bits of the code point and LOW is the least significant 16 bits. `:max-code' -VALUE must be an integer specifying the maxinum code point of the +VALUE must be an integer specifying the maximum code point of the charset. If omitted, it is calculated from `:code-space'. VALUE may be a cons (HIGH . LOW), where HIGH is the most significant 16 bits of the code point and LOW is the least significant 16 bits. @@ -1566,7 +1566,7 @@ of `ctext-non-standard-encodings-alist'.") ;; Return an alist of CHARSET vs CTEXT-USAGE-INFO generated from ;; `ctext-non-standard-encodings' and a list specified by the key -;; `ctext-non-standard-encodings' for the currrent language +;; `ctext-non-standard-encodings' for the current language ;; environment. CTEXT-USAGE-INFO is one of the element of ;; `ctext-non-standard-encodings-alist' or nil. In the former case, a ;; character in CHARSET is encoded using extended segment. In the diff --git a/lisp/international/quail.el b/lisp/international/quail.el index f47d73a9508..a29b729dcf0 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -43,7 +43,7 @@ ;; CONVERSION-KEYS argument of the Quail package. ;; [There was an input method for Mule 2.3 called `Tamago' from the -;; Japanese `TAkusan MAtasete GOmenasai', or `Sorry for having you +;; Japanese `TAkusan MAtasete GOmen-nasai', or `Sorry for having you ;; wait so long'; this couldn't be included in Emacs 20. `Tamago' is ;; Japanese for `egg' (implicitly a hen's egg). Handa-san made a ;; smaller and simpler system; the smaller quail egg is also eaten in @@ -1377,7 +1377,7 @@ Return the input string." (set-buffer-modified-p modified-p) (quail-show-guidance) (let* ((prompt (if input-method-use-echo-area - (format "%s%s %s" + (format "%s%s %s" (or input-method-previous-message "") quail-current-str quail-guidance-str))) @@ -1443,7 +1443,7 @@ Return the input string." (quail-setup-overlays nil))) (quail-show-guidance) (let* ((prompt (if input-method-use-echo-area - (format "%s%s%s %s" + (format "%s%s%s %s" (or input-method-previous-message "") quail-conversion-str quail-current-str @@ -2011,7 +2011,7 @@ minibuffer and the selected frame has no other windows)." (set-window-dedicated-p win t)) (quail-minibuffer-message (format " [%s]" current-input-method-title))) - ;; Show the guidance in the next line of the currrent + ;; Show the guidance in the next line of the current ;; minibuffer. (quail-minibuffer-message (format " [%s]\n%s" @@ -2125,7 +2125,7 @@ minibuffer and the selected frame has no other windows)." (- quail-guidance-translations-starting-column 7 (string-width str)) 32)))) - (setq str (format "%s(%02d/%s)" + (setq str (format "%s(%02d/%s)" str (nth 3 indices) (if (nth 4 indices) (format "%02d" (nth 4 indices)) @@ -2135,7 +2135,7 @@ minibuffer and the selected frame has no other windows)." (trans (aref (cdr quail-current-translations) idx))) (or (stringp trans) (setq trans (string trans))) - (setq str (format "%s %d.%s" + (setq str (format "%s %d.%s" str (if (= (- idx start) 9) 0 (1+ (- idx start))) @@ -2701,7 +2701,7 @@ KEY BINDINGS FOR CONVERSION (put 'quail-decode-map 'char-table-extra-slots 0) -;; Generate a halfly-cooked decode map (char-table) for the current +;; Generate a half-cooked decode map (char-table) for the current ;; Quail map. An element for a character C is a key string or a list ;; of a key strings to type to input C. The lenth of key string is at ;; most 2. If it is 2, more keys may be required to input C. @@ -2787,7 +2787,7 @@ If CHAR is an ASCII character and can be input by typing itself, return t." (cdr decode-map))) (let ((key-head (aref decode-map char))) (if (stringp key-head) - (setq key-list (quail-find-key1 + (setq key-list (quail-find-key1 (quail-lookup-key key-head nil t) key-head char nil)) (mapc #'(lambda (elt) @@ -2974,7 +2974,7 @@ of each directory." (if (not (re-search-forward leim-list-entry-regexp nil t)) nil - ;; Remove garbages after the header. + ;; Remove garbage after the header. (goto-char (match-beginning 0)) (if (< pos (point)) (delete-region pos (point))) diff --git a/lisp/international/robin.el b/lisp/international/robin.el index 7e98a507f93..443a292f4c1 100644 --- a/lisp/international/robin.el +++ b/lisp/international/robin.el @@ -22,7 +22,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. -;;; Comentary: +;;; Commentary: ;; Functionalities ;; --------------- @@ -229,7 +229,7 @@ ;; As stated in Murphy's law, it took longer than expected to develop the ;; very first version of Japanese input subsystem in NEmacs (Nihongo ;; Emacs). So the subsystem was named "TAMAGO", which is an acronym of -;; "TAkusan Matasete GOmennasai" (Sorry to have kept you waiting so +;; "TAkusan Matasete GOmen-nasai" (Sorry to have kept you waiting so ;; long). "Tamago" as a Japanese word means "egg", so the word "egg" was ;; also used for related filenames and function names. diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index e68dc8bdc17..757322aa0ce 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -305,7 +305,7 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy (cond ((looking-at "PROMPT:[ \t]*") (goto-char (match-end 0)) (setq tit-prompt (tit-read-key-value)) - ;; Some TIT dictionaies that are encoded by + ;; Some TIT dictionaries that are encoded by ;; euc-china contains invalid character at the tail. (let* ((last (aref tit-prompt (1- (length tit-prompt)))) (split (split-char last))) @@ -734,7 +734,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." ;; dictionary in the buffer DICBUF. The input method name of the ;; Quail package is NAME, and the title string is TITLE. -;; TSANG-P is non-nil, genereate $(06AQo(B input method. Otherwise +;; TSANG-P is non-nil, generate $(06AQo(B input method. Otherwise ;; generate $(0X|/y(B (simple version of $(06AQo(B). If BIG5-P is non-nil, the ;; input method is for inputting Big5 characters. Otherwise the input ;; method is for inputting CNS characters. diff --git a/lisp/isearch.el b/lisp/isearch.el index 3ffe6e8a656..977de6ac4b0 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el @@ -542,8 +542,8 @@ Each set is a vector of the form: (defvar isearch-string "") ; The current search string. (defvar isearch-message "") ; text-char-description version of isearch-string -(defvar isearch-message-prefix-add nil) ; Additonal text for the message prefix -(defvar isearch-message-suffix-add nil) ; Additonal text for the message suffix +(defvar isearch-message-prefix-add nil) ; Additional text for the message prefix +(defvar isearch-message-suffix-add nil) ; Additional text for the message suffix (defvar isearch-success t) ; Searching is currently successful. (defvar isearch-error nil) ; Error message for failed search. @@ -2243,7 +2243,7 @@ If there is no completion possible, say so and continue searching." ;; Searching (defvar isearch-search-fun-function nil - "Overrides the default `isearch-search-fun' behaviour. + "Overrides the default `isearch-search-fun' behavior. This variable's value should be a function, which will be called with no arguments, and should return a function that takes three arguments: STRING, BOUND, and NOERROR. diff --git a/lisp/iswitchb.el b/lisp/iswitchb.el index a7d3328526a..a96fbf9253f 100644 --- a/lisp/iswitchb.el +++ b/lisp/iswitchb.el @@ -163,7 +163,7 @@ ;; Font-Lock ;; font-lock is used to highlight the first matching buffer. To -;; switch this off, set (setq iswitchb-use-faces nil). Colouring of +;; switch this off, set (setq iswitchb-use-faces nil). Coloring of ;; the matching buffer name was suggested by Carsten Dominik ;; (dominik@strw.leidenuniv.nl) @@ -1110,7 +1110,7 @@ Return the modified list with the last element prepended to it." (if (fboundp 'set-buffer-major-mode) (set-buffer-major-mode newbufcreated)) (iswitchb-visit-buffer newbufcreated)) - ;; else wont create new buffer + ;; else won't create new buffer (message "no buffer matching `%s'" buf)))) (defun iswitchb-window-buffer-p (buffer) diff --git a/lisp/kmacro.el b/lisp/kmacro.el index e47f571db71..eea3009faf4 100644 --- a/lisp/kmacro.el +++ b/lisp/kmacro.el @@ -1020,7 +1020,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1', (setq executing-kbd-macro-index (- executing-kbd-macro-index (length unread-command-events)) next-index executing-kbd-macro-index))))) - ;; Query the user; stop macro exection temporarily + ;; Query the user; stop macro execution temporarily. (let ((macro executing-kbd-macro) (executing-kbd-macro nil) (defining-kbd-macro nil)) diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el index bb242a50acc..444f4d519da 100644 --- a/lisp/language/ethio-util.el +++ b/lisp/language/ethio-util.el @@ -582,7 +582,7 @@ See also the descriptions of the variables (narrow-to-region p (point)) (robin-invert-region (point-min) (point-max) "ethiopic-sera") - ;; ethio-quote-vowel-alwyas + ;; ethio-quote-vowel-always (goto-char (point-min)) (while (re-search-forward "'[eauio]" nil t) (save-excursion diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el index 22ccd56dab3..13a645a9975 100644 --- a/lisp/language/ethiopic.el +++ b/lisp/language/ethiopic.el @@ -61,7 +61,7 @@ (features ethio-util) (sample-text . "ፊደል") (documentation . -"This language envrironment provides these function key bindings: +"This language environment provides these function key bindings: [f3] ethio-fidel-to-sera-buffer [S-f3] ethio-fidel-to-sera-region [C-f3] ethio-fidel-to-sera-marker diff --git a/lisp/language/european.el b/lisp/language/european.el index 6dfc03d0f5f..5bdec6dec7b 100644 --- a/lisp/language/european.el +++ b/lisp/language/european.el @@ -146,8 +146,8 @@ These languages are supported with the Latin-3 (ISO-8859-3) character set: (input-method . "latin-4-postfix") (documentation . "\ These languages are supported with the Latin-4 (ISO-8859-4) character set: - Danish, English, Estonian, Finnish, German, Greenlandic, Lappish, - Latvian, Lithuanian, and Norwegian.")) + Danish, English, Estonian, Finnish, German, Greenlandic, Latvian, + Lithuanian, Norwegian, and Sami.")) '("European")) @@ -226,7 +226,7 @@ See also the Turkish environment.")) "ISO 2022 based 8-bit encoding for Latin-8 (MIME:ISO-8859-14)." :coding-type 'charset ;; `W' for `Welsh', since `C' for `Celtic' is taken. - :mnemonic ?W + :mnemonic ?W :charset-list '(iso-8859-14) :mime-charset 'iso-8859-14) @@ -610,7 +610,7 @@ method and applying Turkish case rules for the characters i, I, $(D)E(B, $(D* (define-coding-system 'mac-roman "Mac Roman Encoding (MIME:MACINTOSH)." :coding-type 'charset - :mnemonic ?M + :mnemonic ?M :charset-list '(mac-roman) :mime-charset 'macintosh) diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el index 81c5577fa57..008eb92dbbc 100644 --- a/lisp/language/lao-util.el +++ b/lisp/language/lao-util.el @@ -371,8 +371,8 @@ consonant. It is a list vowel characters or 0. The element 0 indicate the place to embed a consonant. Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL -follwoing a consonant and preceding a maa-sakod character. If it is -nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is alwasy +following a consonant and preceding a maa-sakod character. If it is +nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is always appended at the tail. For instance, rule `(\"(1`WM(B\" (?(1`(B t ?(1W(B ?(1M(B))' tells that this vowel diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el index b9c250fd700..25a10633a28 100644 --- a/lisp/language/romanian.el +++ b/lisp/language/romanian.el @@ -35,7 +35,7 @@ (unibyte-display . iso-8859-2) (tutorial . "TUTORIAL.ro") (sample-text . "Bun ziua, bine ai venit!") - (documentation . "Rmoanian environment using Latin-2 encoding. + (documentation . "Romanian environment using Latin-2 encoding. An environment for generic Latin-10 encoding is also available.")) '("European")) diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el index 97d5037f3c5..4034566afca 100644 --- a/lisp/language/vietnamese.el +++ b/lisp/language/vietnamese.el @@ -28,7 +28,7 @@ ;;; Commentary: -;; For Vietnames, the character sets VISCII, VSCII and TCVN-5712 are +;; For Vietnamese, the character sets VISCII, VSCII and TCVN-5712 are ;; supported. ;;; Code: @@ -84,7 +84,7 @@ (documentation . "\ For Vietnamese, Emacs uses special charsets internally. They can be decoded from and encoded to VISCII, VSCII, TCVN-5712, VIQR -and windows-1258. VSCII is deprecated in favour of TCVN-5712. The +and windows-1258. VSCII is deprecated in favor of TCVN-5712. The Current setting gives higher priority to the coding system VISCII than TCVN-5712. If you prefer TCVN-5712, please do: (prefer-coding-system 'vietnamese-tcvn). There are two Vietnamese input methods: VIQR and diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 0ce53fcb9a3..7f595db4814 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -11099,7 +11099,7 @@ the rightmost is selected. If ARG is nil, the leftmost window is selected if the original window is the first one in the frame. To bind this command to a hotkey, place the following line -in your `~/.emacs' file, replacing [f7] by your favourite key: +in your `~/.emacs' file, replacing [f7] by your favorite key: (global-set-key [f7] 'follow-delete-other-windows-and-split) \(fn &optional ARG)" t nil) @@ -20621,7 +20621,7 @@ normalized footnotes towards the end of the pre-processing buffer. Some exporters like docbook, odt, etc. expect that footnote definitions be available before any references to them. Such exporters can let bind `org-footnote-insert-pos-for-preprocessor' to -symbol 'point-min to achieve the desired behaviour. +symbol 'point-min to achieve the desired behavior. Additional note on `org-footnote-insert-pos-for-preprocessor': 1. This variable has not effect when FOR-PREPROCESSOR is nil. @@ -26109,7 +26109,7 @@ That's all. Here's the board after two moves: o o o -Pick your favourite shortcuts: +Pick your favorite shortcuts: \\{solitaire-mode-map} @@ -27789,7 +27789,7 @@ This mode is usually not used directly; instead, other major modes are derived from it, using `define-derived-mode'. In this major mode, the buffer is divided into multiple columns, -which are labelled using the header line. Each non-empty line +which are labeled using the header line. Each non-empty line belongs to one \"entry\", and the entries can be sorted according to their column values. diff --git a/lisp/loadhist.el b/lisp/loadhist.el index 0b569199935..da20e4cb7ca 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -144,7 +144,7 @@ These are symbols with hooklike values whose names don't end in pertinent symbols.") (defvar unload-function-defs-list nil - "List of defintions in the Lisp library being unloaded. + "List of definitions in the Lisp library being unloaded. This is meant to be used by `FEATURE-unload-function'; see the documentation of `unload-feature' for details.") diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el index f4b29958aab..47583e3f860 100644 --- a/lisp/mail/feedmail.el +++ b/lisp/mail/feedmail.el @@ -83,7 +83,7 @@ ;; work properly. If you don't know what custom is all about and want ;; to edit your user option elisp variables the old fashioned way, ;; just imagine that all the "defcustom" stuff you see below is really -;; "defvar", and ignore everthing else. For info about custom, see +;; "defvar", and ignore everything else. For info about custom, see ;; <URL:http://www.dina.kvl.dk/~abraham/custom/>. ;; ;; This code does in elisp a superset of the stuff that used to be done @@ -336,7 +336,7 @@ ;; for FQM files if you're a VM user ;; change buffer-substring calls to buffer-substring-no-properties for ;; speed-up (suggested by Howard Melman <howard@silverstream.com>) -;; feedmail-sendmail-f-doesnt-sell-me-out to contol "-f" in call to sendmail +;; feedmail-sendmail-f-doesnt-sell-me-out to control "-f" in call to sendmail ;; in feedmail-buffer-to-sendmail ;; better trapping of odd conditions during the running of the queue; ;; thanks to Yigal Hochberg for helping me test much of this by remote @@ -1356,7 +1356,7 @@ for you. Add this function to `mail-send-hook' with something like this: (add-hook 'mail-send-hook 'feedmail-mail-send-hook-splitter) Then add the functions you want called to either `feedmail-mail-send-hook-queued' -or `feedmail-mail-send-hook', as apprpriate. The distinction is that +or `feedmail-mail-send-hook', as appropriate. The distinction is that `feedmail-mail-send-hook' will be called when you send mail from a composition buffer (typically by typing C-c C-c), whether the message is sent immediately or placed in the queue or drafts directory. `feedmail-mail-send-hook-queued' is @@ -2410,7 +2410,7 @@ mapped to mostly alphanumerics for safety." (a-re-dtcb "^\\(To\\|Cc\\|Bcc\\):") (a-re-dtc "^\\(To\\|Cc\\):") (a-re-db "^Bcc:") - ;; to get a temporary changable copy + ;; to get a temporary changeable copy (mail-header-separator mail-header-separator) ) (unwind-protect diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el index c3a7da41823..12826001d86 100644 --- a/lisp/mail/mail-extr.el +++ b/lisp/mail/mail-extr.el @@ -1961,7 +1961,7 @@ place. It affects how `mail-extract-address-components' works." ("gw" "Guinea-Bissau") ("gy" "Guyana") ("hk" "Hong Kong") - ("hm" "Heard Island and Mcdonald Islands") + ("hm" "Heard Island and McDonald Islands") ("hn" "Honduras") ("hr" "Croatia" "Croatia (Hrvatska)") ("ht" "Haiti") diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el index 70226b26965..14a76746797 100644 --- a/lisp/mail/rmail-spam-filter.el +++ b/lisp/mail/rmail-spam-filter.el @@ -317,7 +317,7 @@ it from rmail file. Called for each new message retrieved by ;; that this email is spam, output the email to the spam ;; rmail file, mark the email for deletion, leave the ;; while loop and return nil so that an rmail summary line - ;; wont be displayed for this message: (FIXME ?) + ;; won't be displayed for this message: (FIXME ?) (if (and (car maybe-spam) (cdr maybe-spam)) (setq exit-while-loop t) ;; Else, spam was not yet found, proceed to next element @@ -554,4 +554,4 @@ checks to see if the old format is used, and updates it if necessary." (provide 'rmail-spam-filter) -;;; rmail-spam-fitler ends here +;;; rmail-spam-filter ends here diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 603a615192a..5d219c0084f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -194,6 +194,7 @@ please report it with \\[report-emacs-bug].") (declare-function mail-dont-reply-to "mail-utils" (destinations)) (declare-function rmail-update-summary "rmailsum" (&rest ignore)) +(declare-function rmail-mime-toggle-hidden "rmailmm" ()) (defun rmail-probe (prog) "Determine what flavor of movemail PROG is. @@ -630,27 +631,20 @@ Element N specifies the summary line for message N+1.") This is set to nil by default.") (defcustom rmail-enable-mime t - "If non-nil, RMAIL uses MIME features. -If the value is t, RMAIL automatically shows MIME decoded message. -If the value is neither t nor nil, RMAIL does not show MIME decoded message -until a user explicitly requires it. - -Even if the value is non-nil, you can't use MIME features -unless the feature specified by `rmail-mime-feature' is available." - :type '(choice (const :tag "on" t) - (const :tag "off" nil) - (other :tag "when asked" ask)) + "If non-nil, RMAIL automatically displays decoded MIME messages. +For this to work, the feature specified by `rmail-mime-feature' must +be available." + :type 'boolean :version "23.3" :group 'rmail) (defvar rmail-enable-mime-composing t "*If non-nil, RMAIL uses `rmail-insert-mime-forwarded-message-function' to forward.") -;; FIXME unused. (defvar rmail-show-mime-function nil - "Function to show MIME decoded message of RMAIL file. + "Function of no argument called to show a decoded MIME message. This function is called when `rmail-enable-mime' is non-nil. -It is called with no argument.") +The package providing MIME support should set this.") ;;;###autoload (defvar rmail-insert-mime-forwarded-message-function nil @@ -686,7 +680,7 @@ where MSG is the message number, REGEXP is the regular expression, LIMIT is the position specifying the end of header.") (defvar rmail-mime-feature 'rmailmm - "Feature to require to load MIME support in Rmail. + "Feature to require for MIME support in Rmail. When starting Rmail, if `rmail-enable-mime' is non-nil, this feature is required with `require'. @@ -836,10 +830,10 @@ isn't provided." (display-warning 'rmail (format "Although MIME support is requested -by setting `rmail-enable-mime' to non-nil, the required feature +through `rmail-enable-mime' being non-nil, the required feature `%s' (the value of `rmail-mime-feature') is not available in the current session. -So, the MIME support is turned off for the moment." +So, MIME support is turned off for the moment." rmail-mime-feature) :warning) (setq rmail-enable-mime nil))))) @@ -1720,10 +1714,12 @@ not be a new one). It returns non-nil if it got any new messages." (setq all-files (cdr all-files))) ;; Put them back in their original order. (setq files (nreverse files)) - ;; In case of brain damage caused by require-final-newline. (goto-char (point-max)) - (skip-chars-backward " \t\n") - (delete-region (point) (point-max)) + ;; Make sure we end with a blank line unless there are + ;; no messages, as required by mbox format (Bug#9974). + (unless (bobp) + (while (not (looking-back "\n\n")) + (insert "\n"))) (setq found (or (rmail-get-new-mail-1 file-name files delete-files) found)))) @@ -2023,22 +2019,12 @@ Value is the size of the newly read mail after conversion." (rmail-unrmail-new-mail-maybe tofile (nth 1 (insert-file-contents tofile)))) - ;; Determine if a pair of newline message separators need - ;; to be added to the new collection of messages. This is - ;; the case for all new message collections added to a - ;; non-empty mail file. - (unless (zerop size) - (save-restriction - (let ((start (point-min))) - (widen) - (unless (eq start (point-min)) - (goto-char start) - (insert "\n\n") - (setq size (+ 2 size)))))) (goto-char (point-max)) - (or (= (preceding-char) ?\n) - (zerop size) - (insert ?\n)) + ;; Make sure the read-in mbox data properly ends with a + ;; blank line unless it is of size 0. + (unless (zerop size) + (while (not (looking-back "\n\n")) + (insert "\n"))) (if (not (and rmail-preserve-inbox (string= file tofile))) (setq delete-files (cons tofile delete-files))))) (message "") @@ -2078,7 +2064,7 @@ Call with point at the end of the message." (defun rmail-add-mbox-headers () "Validate the RFC2822 format for the new messages. Point should be at the first new message. -An error is signalled if the new messages are not RFC2822 +An error is signaled if the new messages are not RFC2822 compliant. Unless an Rmail attribute header already exists, add it to the new messages. Return the number of new messages." @@ -2447,7 +2433,7 @@ Output a helpful message unless NOMSG is non-nil." ;; the entry for message N+1, which marks ;; the end of message N. (N = number of messages). (setq messages-head (list (point-marker))) - (setq messages-after-point + (setq messages-after-point (or (rmail-set-message-counters-counter (min (point) point-save)) 0)) @@ -2609,6 +2595,8 @@ Ask the user whether to add that list name to `mail-mailing-lists'." "Return nil if there is mail, else \"No mail.\"." (if (zerop rmail-total-messages) (save-excursion + ;; Eg we deleted all the messages, so remove the old N/M mark. + (with-current-buffer rmail-buffer (setq mode-line-process nil)) (with-current-buffer rmail-view-buffer (erase-buffer) "No mail.")))) @@ -2705,6 +2693,7 @@ The current mail message becomes the message displayed." ;; inspect this value to determine how to toggle. (set (make-local-variable 'rmail-header-style) header-style)) (if (and rmail-enable-mime + rmail-show-mime-function (re-search-forward "mime-version: 1.0" nil t)) (let ((rmail-buffer mbox-buf) (rmail-view-buffer view-buf)) @@ -3101,7 +3090,7 @@ but probably is garbage." ;; correspond to the lines in the inbox file. (goto-char (point-min)) (if header-field - (progn + (progn (re-search-forward (concat "^" (regexp-quote header-field)) nil t) (forward-line line-number-within)) (search-forward "\n\n" nil t) @@ -3262,6 +3251,7 @@ Interactively, empty argument means use same regexp used last time." Simplifying the subject means stripping leading and trailing whitespace, and typical reply prefixes such as Re:." (let ((subject (or (rmail-get-header "Subject" msgnum) ""))) + (setq subject (rfc2047-decode-string subject)) (if (string-match "\\`[ \t]+" subject) (setq subject (substring subject (match-end 0)))) (if (string-match rmail-reply-regexp subject) @@ -4449,7 +4439,7 @@ encoded string (and the same mask) will decode the string." ;;; Start of automatically extracted autoloads. ;;;### (autoloads (rmail-edit-current-message) "rmailedit" "rmailedit.el" -;;;;;; "090ad9432c3bf9a6098bb9c3d7c71baf") +;;;;;; "7f9bff22ed0bbac561c97fd1e3ab503d") ;;; Generated autoloads from rmailedit.el (autoload 'rmail-edit-current-message "rmailedit" "\ @@ -4504,28 +4494,29 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "2c8675d7c069c68bc36a4003b15448d1") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "6296f0170a37670c49a88a1b92d78187") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ -Toggle displaying of a MIME message. - -The actualy behavior depends on the value of `rmail-enable-mime'. +Toggle the display of a MIME message. -If `rmail-enable-mime' is t (default), this command change the -displaying of a MIME message between decoded presentation form -and raw data. +The actual behavior depends on the value of `rmail-enable-mime'. -With ARG, toggle the displaying of the current MIME entity only. +If `rmail-enable-mime' is non-nil (the default), this command toggles +the display of a MIME message between decoded presentation form and +raw data. With optional prefix argument ARG, it toggles the display only +of the MIME entity at point, if there is one. The optional argument +STATE forces a particular display state, rather than toggling. +`raw' forces raw mode, any other non-nil value forces decoded mode. -If `rmail-enable-mime' is nil, this creates a temporary -\"*RMAIL*\" buffer holding a decoded copy of the message. Inline -content-types are handled according to -`rmail-mime-media-type-handlers-alist'. By default, this -displays text and multipart messages, and offers to download -attachments as specfied by `rmail-mime-attachment-dirs-alist'. +If `rmail-enable-mime' is nil, this creates a temporary \"*RMAIL*\" +buffer holding a decoded copy of the message. Inline content-types are +handled according to `rmail-mime-media-type-handlers-alist'. +By default, this displays text and multipart messages, and offers to +download attachments as specified by `rmail-mime-attachment-dirs-alist'. +The arguments ARG and STATE have no effect in this case. -\(fn &optional ARG)" t nil) +\(fn &optional ARG STATE)" t nil) ;;;*** @@ -4605,7 +4596,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic ;;;;;; rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels -;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "3817e21639db697abe5832d3223ecfc2") +;;;;;; rmail-summary) "rmailsum" "rmailsum.el" "35e07b0a5ea8e41971f31a8780eba6bb") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el index 868ca15923f..7e70f66ef11 100644 --- a/lisp/mail/rmailedit.el +++ b/lisp/mail/rmailedit.el @@ -78,6 +78,7 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'. (defvar rmail-old-text) +(defvar rmail-old-mime-state) (defvar rmail-old-pruned nil "Non-nil means the message being edited originally had pruned headers.") (put 'rmail-old-pruned 'permanent-local t) @@ -86,6 +87,10 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'. "Holds the headers of this message before editing started.") (put 'rmail-old-headers 'permanent-local t) +;; Everything we use from here is a defsubst. +(eval-when-compile + (require 'rmailmm)) + ;;;###autoload (defun rmail-edit-current-message () "Edit the contents of this message." @@ -96,6 +101,28 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'. (make-local-variable 'rmail-old-pruned) (setq rmail-old-pruned (rmail-msg-is-pruned)) (rmail-edit-mode) + (set (make-local-variable 'rmail-old-mime-state) + (and rmail-enable-mime + ;; If you use something else, you are on your own. + (eq rmail-mime-feature 'rmailmm) + (rmail-mime-message-p) + (let ((entity (get-text-property (point-min) 'rmail-mime-entity))) + ;; rmailmm has got its hands on the message. + ;; Even if the message is in `raw' state, boundaries etc + ;; are still missing. All we can do is insert the real + ;; raw message. (Bug#9840) + (when (and entity + (not (equal "text/plain" + (car (rmail-mime-entity-type entity))))) + (let ((inhibit-read-only t)) + (erase-buffer) + (insert-buffer-substring + rmail-view-buffer + (aref (rmail-mime-entity-header entity) 0) + (aref (rmail-mime-entity-body entity) 1))) + (goto-char (point-min)) + ;; t = decoded; raw = raw. + (aref (aref (rmail-mime-entity-display entity) 0) 0))))) (make-local-variable 'rmail-old-text) (setq rmail-old-text (save-restriction @@ -134,7 +161,10 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'. (error "There must be a blank line at the end of the headers")) ;; Disguise any "From " lines so they don't start a new message. (goto-char (point-min)) - (or rmail-old-pruned (forward-line 1)) + ;; This tries to skip the mbox From. FIXME less fragile to go to EOH? + (if (or rmail-old-mime-state + (not rmail-old-pruned)) + (forward-line 1)) (while (re-search-forward "^>*From " nil t) (beginning-of-line) (insert ">") @@ -145,6 +175,7 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'. (rmail-ensure-blank-line) (let ((old rmail-old-text) (pruned rmail-old-pruned) + (mime-state rmail-old-mime-state) ;; People who know what they are doing might have modified the ;; buffer's encoding if editing the message included inserting ;; characters that were unencodable by the original message's @@ -256,7 +287,9 @@ This function runs the hooks `text-mode-hook' and `rmail-edit-mode-hook'. ;;; (if (boundp 'rmail-summary-vector) ;;; (aset rmail-summary-vector (1- rmail-current-message) nil)) (rmail-show-message) - (rmail-toggle-header (if pruned 1 0))) + (rmail-toggle-header (if pruned 1 0)) + ;; Restore mime display state. + (and mime-state (rmail-mime nil mime-state))) (run-hooks 'rmail-mode-hook)) (defun rmail-abort-edit () diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index d3351255583..f3b539c52d0 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el @@ -155,7 +155,7 @@ MIME entities.") (defun rmail-mime-entity (type disposition transfer-encoding display header tagline body children handler &optional truncated) - "Retrun a newly created MIME-entity object from arguments. + "Return a newly created MIME-entity object from arguments. A MIME-entity is a vector of 10 elements: @@ -180,16 +180,16 @@ The corresponding TYPE argument must be: \(\"boundary\" . \"----=_NextPart_000_0104_01C617E4.BDEC4C40\")) TRANSFER-ENCODING corresponds to MIME header -Content-Transfer-Encoding, and is a lowercased string. +Content-Transfer-Encoding, and is a lower-case string. DISPLAY is a vector [CURRENT NEW], where CURRENT indicates how -the header, tagline, and body of the entity are displayed now, -and NEW indicates how their displaying should be updated. -Both elements are vector [HEADER-DISPLAY TAGLINE-DISPLAY BODY-DISPLAY], -where each element is a symbol for the corresponding item that -has these values: +the header, tag line, and body of the entity are displayed now, +and NEW indicates how their display should be updated. +Both elements are vectors [HEADER-DISPLAY TAGLINE-DISPLAY BODY-DISPLAY], +where each constituent element is a symbol for the corresponding +item with these values: nil: not displayed - t: displayed by the decoded presentation form + t: displayed by the decoded presentation form raw: displayed by the raw MIME data (for the header and body only) HEADER and BODY are vectors [BEG END DISPLAY-FLAG], where BEG and @@ -201,11 +201,11 @@ presentation form. TAGLINE is a vector [TAG BULK-DATA DISPLAY-FLAG], where TAG is a string indicating the depth and index number of the entity, BULK-DATA is a cons (SIZE . TYPE) indicating the size and type of -an attached data, DISPLAY-FLAG non-nil means that the tagline is, -by default, displayed. +an attached data, DISPLAY-FLAG non-nil means that the tag line is +displayed by default. CHILDREN is a list of child MIME-entities. A \"multipart/*\" -entity have one or more children. A \"message/rfc822\" entity +entity has one or more children. A \"message/rfc822\" entity has just one child. Any other entity has no child. HANDLER is a function to insert the entity according to DISPLAY. @@ -284,10 +284,10 @@ TRUNCATED is non-nil if the text of this entity was truncated." (defun rmail-mime-entity-segment (pos &optional entity) "Return a vector describing the displayed region of a MIME-entity at POS. Optional 2nd argument ENTITY is the MIME-entity at POS. -The value is a vector [ INDEX HEADER TAGLINE BODY END], where - INDEX: index into the returned vector indicating where POS is (1..3). +The value is a vector [INDEX HEADER TAGLINE BODY END], where + INDEX: index into the returned vector indicating where POS is (1..3) HEADER: the position of the beginning of a header - TAGLINE: the position of the beginning of a tagline + TAGLINE: the position of the beginning of a tag line BODY: the position of the beginning of a body END: the position of the end of the entity." (save-excursion @@ -331,7 +331,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where (vector index beg tagline-beg body-beg end))))) (defun rmail-mime-shown-mode (entity) - "Make MIME-entity ENTITY displayed by the default way." + "Make MIME-entity ENTITY display in the default way." (let ((new (aref (rmail-mime-entity-display entity) 1))) (aset new 0 (aref (rmail-mime-entity-header entity) 2)) (aset new 1 (aref (rmail-mime-entity-tagline entity) 2)) @@ -340,7 +340,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where (rmail-mime-shown-mode child))) (defun rmail-mime-hidden-mode (entity) - "Make MIME-entity ENTITY displayed in the hidden mode." + "Make MIME-entity ENTITY display in hidden mode." (let ((new (aref (rmail-mime-entity-display entity) 1))) (aset new 0 nil) (aset new 1 t) @@ -349,7 +349,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where (rmail-mime-hidden-mode child))) (defun rmail-mime-raw-mode (entity) - "Make MIME-entity ENTITY displayed in the raw mode." + "Make MIME-entity ENTITY display in raw mode." (let ((new (aref (rmail-mime-entity-display entity) 1))) (aset new 0 'raw) (aset new 1 nil) @@ -357,13 +357,17 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where (dolist (child (rmail-mime-entity-children entity)) (rmail-mime-raw-mode child))) -(defun rmail-mime-toggle-raw (entity) - "Toggle on and off the raw display mode of MIME-entity ENTITY." +(defun rmail-mime-toggle-raw (&optional state) + "Toggle on and off the raw display mode of MIME-entity at point. +With optional argument STATE, force the specified display mode. +Use `raw' for raw mode, and any other non-nil value for decoded mode." (let* ((pos (if (eobp) (1- (point-max)) (point))) (entity (get-text-property pos 'rmail-mime-entity)) (current (aref (rmail-mime-entity-display entity) 0)) (segment (rmail-mime-entity-segment pos entity))) - (if (not (eq (aref current 0) 'raw)) + (if (or (eq state 'raw) + (and (not state) + (not (eq (aref current 0) 'raw)))) ;; Enter the raw mode. (rmail-mime-raw-mode entity) ;; Enter the shown mode. @@ -376,7 +380,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where (restore-buffer-modified-p modified))))) (defun rmail-mime-toggle-hidden () - "Hide or show the body of MIME-entity at point." + "Hide or show the body of the MIME-entity at point." (interactive) (when (rmail-mime-message-p) (let* ((rmail-mime-mbox-buffer rmail-view-buffer) @@ -424,7 +428,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where (defun rmail-mime-insert-tagline (entity &rest item-list) "Insert a tag line for MIME-entity ENTITY. -ITEM-LIST is a list of strings or button-elements (list) to be added +ITEM-LIST is a list of strings or button-elements (list) to add to the tag line." (insert "\n[") (let ((tag (aref (rmail-mime-entity-tagline entity) 0))) @@ -464,7 +468,7 @@ to the tag line." (defun rmail-mime-insert-header (header) "Decode and insert a MIME-entity header HEADER in the current buffer. HEADER is a vector [BEG END DEFAULT-STATUS]. -See `rmail-mime-entity' for the detail." +See `rmail-mime-entity' for details." (let ((pos (point)) (last-coding-system-used nil)) (save-restriction @@ -484,7 +488,7 @@ See `rmail-mime-entity' for the detail." (insert "\n")))) (defun rmail-mime-find-header-encoding (header) - "Retun the last coding system used to decode HEADER. + "Return the last coding system used to decode HEADER. HEADER is a header component of a MIME-entity object (see `rmail-mime-entity')." (with-temp-buffer @@ -882,7 +886,7 @@ The other arguments are the same as `rmail-mime-multipart-handler'." ;; We're handling what's left of a truncated message. (setq next (point-max-marker))) (t - ;; The original code signalled an error as below, but + ;; The original code signaled an error as below, but ;; this line may be a boundary of nested multipart. So, ;; we just set `next' to nil to skip this line ;; (rmail-mm-get-boundary-error-message @@ -1011,7 +1015,7 @@ point should be at the beginning of the body. CONTENT-TYPE, CONTENT-DISPOSITION, and CONTENT-TRANSFER-ENCODING are the values of the respective parsed headers. The latter should -be downcased. The parsed headers for CONTENT-TYPE and CONTENT-DISPOSITION +be lower-case. The parsed headers for CONTENT-TYPE and CONTENT-DISPOSITION have the form \(VALUE . ALIST) @@ -1196,7 +1200,7 @@ modified." (defun rmail-mime-parse () "Parse the current Rmail message as a MIME message. -The value is a MIME-entiy object (see `rmail-mime-entity'). +The value is a MIME-entity object (see `rmail-mime-entity'). If an error occurs, return an error message string." (let ((rmail-mime-mbox-buffer (if (rmail-buffers-swapped-p) rmail-view-buffer @@ -1265,36 +1269,35 @@ available." (setq font-lock-defaults '(rmail-font-lock-keywords t t nil nil))) ;;;###autoload -(defun rmail-mime (&optional arg) - "Toggle displaying of a MIME message. - -The actualy behavior depends on the value of `rmail-enable-mime'. - -If `rmail-enable-mime' is t (default), this command change the -displaying of a MIME message between decoded presentation form -and raw data. - -With ARG, toggle the displaying of the current MIME entity only. - -If `rmail-enable-mime' is nil, this creates a temporary -\"*RMAIL*\" buffer holding a decoded copy of the message. Inline -content-types are handled according to -`rmail-mime-media-type-handlers-alist'. By default, this -displays text and multipart messages, and offers to download -attachments as specfied by `rmail-mime-attachment-dirs-alist'." - (interactive "P") +(defun rmail-mime (&optional arg state) + "Toggle the display of a MIME message. + +The actual behavior depends on the value of `rmail-enable-mime'. + +If `rmail-enable-mime' is non-nil (the default), this command toggles +the display of a MIME message between decoded presentation form and +raw data. With optional prefix argument ARG, it toggles the display only +of the MIME entity at point, if there is one. The optional argument +STATE forces a particular display state, rather than toggling. +`raw' forces raw mode, any other non-nil value forces decoded mode. + +If `rmail-enable-mime' is nil, this creates a temporary \"*RMAIL*\" +buffer holding a decoded copy of the message. Inline content-types are +handled according to `rmail-mime-media-type-handlers-alist'. +By default, this displays text and multipart messages, and offers to +download attachments as specified by `rmail-mime-attachment-dirs-alist'. +The arguments ARG and STATE have no effect in this case." + (interactive (list current-prefix-arg nil)) (if rmail-enable-mime (with-current-buffer rmail-buffer (if (rmail-mime-message-p) (let ((rmail-mime-mbox-buffer rmail-view-buffer) (rmail-mime-view-buffer rmail-buffer) - (entity (get-text-property (point) 'rmail-mime-entity))) - (if arg - (if entity - (rmail-mime-toggle-raw entity)) - (goto-char (point-min)) - (rmail-mime-toggle-raw - (get-text-property (point) 'rmail-mime-entity)))) + (entity (get-text-property + (progn + (or arg (goto-char (point-min))) + (point)) 'rmail-mime-entity))) + (if (or (not arg) entity) (rmail-mime-toggle-raw state))) (message "Not a MIME message"))) (let* ((data (rmail-apply-in-message rmail-current-message 'buffer-string)) (buf (get-buffer-create "*RMAIL*")) @@ -1315,12 +1318,12 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'." (view-buffer buf)))) (defun rmail-mm-get-boundary-error-message (message type disposition encoding) - "Return MESSAGE with more information on the main mime components." + "Return MESSAGE with more information on the main MIME components." (error "%s; type: %s; disposition: %s; encoding: %s" message type disposition encoding)) (defun rmail-show-mime () - "Function to set in `rmail-show-mime-function' (which see)." + "Function to use for the value of `rmail-show-mime-function'." (let ((entity (rmail-mime-parse)) (rmail-mime-mbox-buffer rmail-buffer) (rmail-mime-view-buffer rmail-view-buffer) @@ -1332,7 +1335,7 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'." (if (consp rmail-mime-coding-system) ;; Decoding is done by rfc2047-decode-region only for a ;; header. But, as the used coding system may have been - ;; overriden by mm-charset-override-alist, we can't + ;; overridden by mm-charset-override-alist, we can't ;; trust (car rmail-mime-coding-system). So, here we ;; try the decoding again with mm-charset-override-alist ;; bound to nil. diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el index 3926b426a67..c168ca9d8f5 100644 --- a/lisp/mail/rmailout.el +++ b/lisp/mail/rmailout.el @@ -377,11 +377,12 @@ display message number MSG." (rmail-maybe-set-message-counters) ;; Insert the new message after the last old message. (widen) - ;; Make sure the last old message ends with a blank line. - (goto-char (point-max)) - (rmail-ensure-blank-line) - ;; Insert the new message at the end. - (narrow-to-region (point-max) (point-max)) + (unless (zerop (buffer-size)) + ;; Make sure the last old message ends with a blank line. + (goto-char (point-max)) + (rmail-ensure-blank-line) + ;; Insert the new message at the end. + (narrow-to-region (point-max) (point-max))) (insert-buffer-substring tembuf) (rmail-count-new-messages t) ;; FIXME should re-use existing windows. diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el index 8e28201e31f..a3f722443dc 100644 --- a/lisp/mail/rmailsum.el +++ b/lisp/mail/rmailsum.el @@ -268,9 +268,7 @@ Setting this option to nil might speed up the generation of summaries." (defun rmail-summary () "Display a summary of all messages, one line per message." (interactive) - (rmail-new-summary "All" '(rmail-summary) nil) - (unless (get-buffer-window rmail-buffer) - (rmail-summary-beginning-of-message))) + (rmail-new-summary "All" '(rmail-summary) nil)) ;;;###autoload (defun rmail-summary-by-labels (labels) @@ -404,13 +402,14 @@ nil for FUNCTION means all messages." (message "Computing summary lines...") (unless rmail-buffer (error "No RMAIL buffer found")) - (let (mesg was-in-summary) + (let (mesg was-in-summary sumbuf) (if (eq major-mode 'rmail-summary-mode) (setq was-in-summary t)) (with-current-buffer rmail-buffer - (if (zerop (setq mesg rmail-current-message)) - (error "No messages to summarize")) - (setq rmail-summary-buffer (rmail-new-summary-1 desc redo func args))) + (setq rmail-summary-buffer (rmail-new-summary-1 desc redo func args) + ;; r-s-b is buffer-local. + sumbuf rmail-summary-buffer + mesg rmail-current-message)) ;; Now display the summary buffer and go to the right place in it. (unless was-in-summary (if (and (one-window-p) @@ -420,13 +419,12 @@ nil for FUNCTION means all messages." (progn (split-window (selected-window) rmail-summary-window-size) (select-window (next-window (frame-first-window))) - (rmail-pop-to-buffer rmail-summary-buffer) + (rmail-pop-to-buffer sumbuf) ;; If pop-to-buffer did not use that window, delete that ;; window. (This can happen if it uses another frame.) - (if (not (eq rmail-summary-buffer - (window-buffer (frame-first-window)))) + (if (not (eq sumbuf (window-buffer (frame-first-window)))) (delete-other-windows))) - (rmail-pop-to-buffer rmail-summary-buffer)) + (rmail-pop-to-buffer sumbuf)) (set-buffer rmail-buffer) ;; This is how rmail makes the summary buffer reappear. ;; We do this here to make the window the proper size. @@ -490,9 +488,6 @@ message." ;; Temporarily, while summary buffer is unfinished, ;; we "don't have" a summary. (setq rmail-summary-buffer nil) - (unless summary-msgs - (kill-buffer sumbuf) - (error "Nothing to summarize")) ;; I have not a clue what this clause is doing. If you read this ;; chunk of code and have a clue, then please email that clue to ;; pmr@pajato.com diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 23947795112..9aa0ba4e262 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -116,21 +116,21 @@ menu-bar-separator) (define-key menu [ps-print-region] - `(menu-item ,(purecopy "Postscript Print Region (B+W)") ps-print-region + `(menu-item ,(purecopy "PostScript Print Region (B+W)") ps-print-region :enable mark-active :help ,(purecopy "Pretty-print marked region in black and white to PostScript printer"))) (define-key menu [ps-print-buffer] - `(menu-item ,(purecopy "Postscript Print Buffer (B+W)") ps-print-buffer + `(menu-item ,(purecopy "PostScript Print Buffer (B+W)") ps-print-buffer :enable (menu-bar-menu-frame-live-and-visible-p) :help ,(purecopy "Pretty-print current buffer in black and white to PostScript printer"))) (define-key menu [ps-print-region-faces] - `(menu-item ,(purecopy "Postscript Print Region") + `(menu-item ,(purecopy "PostScript Print Region") ps-print-region-with-faces :enable mark-active :help ,(purecopy "Pretty-print marked region to PostScript printer"))) (define-key menu [ps-print-buffer-faces] - `(menu-item ,(purecopy "Postscript Print Buffer") + `(menu-item ,(purecopy "PostScript Print Buffer") ps-print-buffer-with-faces :enable (menu-bar-menu-frame-live-and-visible-p) :help ,(purecopy "Pretty-print current buffer to PostScript printer"))) diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index ee9c9fca2b5..ca179a78b61 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,7 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * mh-search.el (mh-pick-parse-search-buffer): Fix typo. + 2011-09-20 Bill Wohler <wohler@newt.com> Release MH-E version 8.3. @@ -40,7 +44,7 @@ switch-to-buffer. The previous change which used pop-to-buffer produced the wrong behavior. -2011-07-12 Henrique Martins <henrique@martins.cc> (tiny change) +2011-07-12 Henrique Martins <henrique@martins.cc> (tiny change) * mh-xface.el (mh-picon-get-image): Remove quote from block argument. diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 69ca927d5e7..b12c47e7f1f 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -610,7 +610,7 @@ 'utils) (mh-require-cl) calls: (eval-when-compile (require 'mh-acros)) - (mh-require-cl) + (mh-require-cl) 2004-08-10 Bill Wohler <wohler@newt.com> @@ -691,7 +691,7 @@ variable `mh-scan-date-regexp'. * mh-customize.el (mh-auto-fields-prompt-flag): Made reference to - `mh-auto-fileds-lists'. + `mh-auto-fields-lists'. (mh-forward-hook): Fixed docstring typo. 2004-08-07 Bill Wohler <wohler@newt.com> @@ -832,7 +832,7 @@ and byte-compiles all the source files with a single instance of XEmacs. (dist): Added $(MH-E-XEMACS-SRC) to tarball. - (AUTO_PRELOADS): Removed, in favour of 'AUTOLOAD_PACKAGE_NAME' and + (AUTO_PRELOADS): Removed, in favor of 'AUTOLOAD_PACKAGE_NAME' and 'AUTOLOAD_FILE'. (AUTOLOAD_PACKAGE_NAME): New. (AUTOLOAD_FILE): New. @@ -1257,7 +1257,7 @@ * Makefile (XEMACS_OPTIONS): Add '-no-autoloads' to give a cleaner build environment. - (AUTO_PRELOADS): Removed, in favour of 'AUTOLOAD_PACKAGE_NAME' and + (AUTO_PRELOADS): Removed, in favor of 'AUTOLOAD_PACKAGE_NAME' and 'AUTOLOAD_FILE'. (AUTOLOAD_PACKAGE_NAME): New. (AUTOLOAD_FILE): New. @@ -1469,7 +1469,7 @@ * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Add an optional dontsign argument to remove an existing secure message directive. - Update the docstring -- this fuction does not allow for + Update the docstring -- this function does not allow for encrypt/sign, just sign directives. * mh-mime.el (mh-mml-secure-message-sign-pgpmime): Use @@ -1484,7 +1484,7 @@ * mh-alias.el (Commentary): Removed as it is now in the manual. (mh-alias-system-aliases): Moved here from mh-customize.el. By definition, "system" definitions are not user-visible, and user - filenames are in the the Aliasfile: profile component, so this + filenames are in the Aliasfile: profile component, so this variable really shouldn't be a defcustom. (mh-alias-tstamp, mh-alias-filenames, mh-alias-reload) (mh-alias-add-alias, mh-alias-grab-from-field) @@ -1960,8 +1960,8 @@ switch between available variants. (mh-variants): Available MH variants are described in this variable. (mh-variant-in-use, mh-variant-p): Developers may check which - variant is currently in use with the variable `mh-variant-in-use' - or the function `mh-variant-p'. + variant is currently in use with the variable `mh-variant-in-use' + or the function `mh-variant-p'. 2003-08-15 Bill Wohler <wohler@newt.com> @@ -3289,7 +3289,7 @@ (mh-tick-add-overlay, mh-tick-remove-overlay, mh-notate-tick): These functions aren't needed any more, since overlays aren't used any more. Also overlays aren't portable to XEmacs, so nasty - conditional code that used overlays in Emacs and extents in Xemacs + conditional code that used overlays in Emacs and extents in XEmacs have been eliminated. (mh-toggle-tick): Generalize it to work on a range of messages like the other interactive messages. @@ -4533,7 +4533,7 @@ * mh-xemacs-toolbar.el: Remove the code since that gets generated when mh-tool-bar-define is expanded. - (mh-xemacs-icon-map): A alist to map GNU Emacs icon names to the + (mh-xemacs-icon-map): An alist to map GNU Emacs icon names to the actual icons to be used in XEmacs. This is used in mh-tool-bar-define. @@ -5022,7 +5022,7 @@ * mh-utils.el (mh-truncate-log-buffer): Modify the function to return the current size of mh-log-buffer. Also we are now a bit more careful in adding separators between consecutive messages. - (mh-exec-cmd): Fix a bug where the the log buffer would be + (mh-exec-cmd): Fix a bug where the log buffer would be displayed even if no error happened in the current command but the log buffer had messages from a previous error. @@ -5130,7 +5130,7 @@ * mh-utils.el (mh-face-display-function): Fix bug that was corrupting xface images when displayed with XEmacs' internal - xface image support. Also make XEmacs honour 'mh-show-xface-face' + xface image support. Also make XEmacs honor 'mh-show-xface-face' when using internal xface image support. 2003-02-12 Peter S Galbraith <psg@debian.org> @@ -5959,7 +5959,7 @@ to allow the user a customizable variable which will turn off folders based completion. (mh-prompt-for-folder): Use mh-folder-completing-read to read in - the folder name with hierachical completion (closes SF #664821). + the folder name with hierarchical completion (closes SF #664821). * mh-speed.el (mh-speed-folders, mh-speed-folders-cache) (mh-speed-folders-actual): Moved to mh-utils.el as mh-sub-folders, @@ -8048,7 +8048,7 @@ 2002-10-26 Peter S Galbraith <psg@debia.org> * mh-comp.el (mh-search-addr-regexp, mh-re-search-to-cc): Remove - `mh-re-search-to-cc' in favour of more generalized new function + `mh-re-search-to-cc' in favor of more generalized new function `mh-search-addr-regexp'. (mh-insert-mail-followup-to): Use it. @@ -8162,7 +8162,7 @@ 2002-10-24 Bill Wohler <wohler@newt.com> - * mh-e is completely checkdoc clean now. + * mh-e is completely checkdoc clean now. * mh-utils.el (mh-clean-message-header-flag): Renamed from mh-clean-message-header. @@ -8594,7 +8594,7 @@ mail-header-separator. (mh-send-letter): The default BCC encapsulation will make a MIME message unreadable. If we are running nmh and the letter contains - a Bcc: and a Content-Type: field, add the -mime switch to to the + a Bcc: and a Content-Type: field, add the -mime switch to the arguments to send. 2002-10-21 Peter S Galbraith <psg@debian.org> @@ -9213,7 +9213,7 @@ font, you may set this variable to expand the single reply button into three buttons that won't lead to minibuffer prompt about who to reply to. - (mh-folder-tool-bar-map): Use mh-tool-bar-reply-3-buttons to + (mh-folder-tool-bar-map): Use mh-tool-bar-reply-3-buttons to decide how many buttons to use for replying. * mh-mime.el (mh-file-mime-type-substitutions) @@ -9445,7 +9445,7 @@ Non-fatal depencencies on the mm-decode, mm-uu and mm-view libraries. -2002-07-15 Satyaki Das <satyaki@theforce.stanford.edu> +2002-07-15 Satyaki Das <satyaki@theforce.stanford.edu> * mh-utils.el (mh-require, mh-autoload): Remove these macros. (mh-decode-mime): Initialized to t iff the mm-decode library is @@ -9455,8 +9455,8 @@ 2002-07-15 Mark D Baushke <mdb@gnu.org> * mh-utils.el (mh-update-scan-format): Rewrite for compatibility - with Xemacs as replace-match appears not to have identical - functionality with FSF emacs. + with XEmacs as replace-match appears not to have identical + functionality with GNU Emacs. (mh-scan-msg-format-regexp): Deleted. This regexp is now hardcoded into the mh-update-scan-format function. @@ -9610,7 +9610,7 @@ 2002-06-27 Satyaki Das <satyaki@theforce.stanford.edu> * mh-e.el (mh-next-undeleted-msg): Get rid of optional arg - reverse-p. If there are no more undeleted messages the the point + reverse-p. If there are no more undeleted messages the point remains at its original position and a message is produced (closes SF #494304). (mh-previous-undeleted-msg): Change similar to @@ -10337,7 +10337,7 @@ arguments in XEmacs. (mh-send-letter): sendmail-coding-system not bound in XEmacs. (mh-send-letter): default-buffer-file-coding-system not bound in - Xemacs. + XEmacs. * mh-e.el (mh-delete-msg, mh-refile-msg, mh-undo): transient-mark-mode not bound in XEmacs. The feature of @@ -10456,10 +10456,10 @@ 2001-12-04 Eric Ding <ericding@alum.mit.edu> - * mh-e.el: changes to face colors on dark backgrounds. - (mh-folder-followup-face): change to LightGoldenRod. - (mh-folder-date-face): change to snow3. - (mh-folder-msg-number-face): change to snow4. + * mh-e.el: changes to face colors on dark backgrounds. + (mh-folder-followup-face): change to LightGoldenRod. + (mh-folder-date-face): change to snow3. + (mh-folder-msg-number-face): change to snow4. 2001-12-04 Bill Wohler <wohler@newt.com> @@ -11049,7 +11049,7 @@ line, starting with Re: (mh-scan-body-regexp): Regexp matching the message body beginning displayed in scan lines. - (mh-scan.font-lock-regexp): Regexp matching output of the the + (mh-scan.font-lock-regexp): Regexp matching output of the optional scan.font-lock format file. (mh-folder-font-lock-keywords): New font-lock for folder-mode that uses the above regexps. @@ -11336,7 +11336,7 @@ typically have 70 lines in my Emacs frame, so having a default of 4 was silly for my case. * mh-e.el (mh-update-sequences): Check for nil value of - mh-current-folder, which happens if mh-summary-height < 4 + mh-current-folder, which happens if mh-summary-height < 4 although I haven't tracked doen why that happens. 2001-10-22 Peter S Galbraith <psg@debian.org> diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el index d1b3ccebf46..c6d60b3b2e2 100644 --- a/lisp/mh-e/mh-alias.el +++ b/lisp/mh-e/mh-alias.el @@ -272,7 +272,7 @@ Blind aliases or users from /etc/passwd are not expanded." (completing-read prompt mh-alias-alist nil nil) ","))))) (if (not mh-alias-expand-aliases-flag) (mapconcat 'identity the-answer ", ") - ;; Loop over all elements, checking if in passwd aliast or blind first + ;; Loop over all elements, checking if in passwd alias or blind first (mapconcat 'mh-alias-expand the-answer ",\n "))))) ;;;###mh-autoload diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el index 882a8771e28..eceb7a5fe3a 100644 --- a/lisp/mh-e/mh-comp.el +++ b/lisp/mh-e/mh-comp.el @@ -504,7 +504,7 @@ See also `mh-compose-forward-as-mime-flag', folder msg) ;; Was inserted before us, move to end of file to preserve order (goto-char (point-max))))))) - ;; Postition just before forwarded message + ;; Position just before forwarded message. (if (re-search-forward "^------- Forwarded Message" nil t) (forward-line -1) (goto-char (mh-mail-header-end)) diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el index 07c558f60cc..88a6ed84055 100644 --- a/lisp/mh-e/mh-compat.el +++ b/lisp/mh-e/mh-compat.el @@ -1,4 +1,4 @@ -;;; mh-compat.el --- make MH-E compatibile with various versions of Emacs +;;; mh-compat.el --- make MH-E compatible with various versions of Emacs ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index e0e213b92b9..b614cdb7991 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -2447,7 +2447,7 @@ of citations entirely, choose \"None\"." "Followup-To:" ; RFC 1036 "For-Approval:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ "For-Comment:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ - "For-Handdling:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ + "For-Handling:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ "Forwarded:" ; MH "From " ; sendmail "Generate-Delivery-Report:" ; RFC 2156 @@ -2478,7 +2478,7 @@ of citations entirely, choose \"None\"." "Original-NNTP-" ; mail to news "Original-Path:" ; mail to news "Original-Received:" ; mail to news - "Original-Recipt:" ; RFC 2298 + "Original-Recipient:" ; RFC 2298 "Original-To:" ; mail to news "Original-X-" ; mail to news "Origination-Client:" ; http://people.dsv.su.se/~jpalme/ietf/mail-headers/ diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el index a547dd8d80a..c06bc6649a5 100644 --- a/lisp/mh-e/mh-search.el +++ b/lisp/mh-e/mh-search.el @@ -646,7 +646,7 @@ Uses the pick method described in `mh-pick-execute-search'." (defun mh-pick-parse-search-buffer () "Parse the search buffer contents. -The function returns a alist. The car of each element is either +The function returns an alist. The car of each element is either the header name to search in or nil to search the whole message. The cdr of the element is the pattern to search." (save-excursion @@ -1791,7 +1791,7 @@ PROC is used to convert the value to actual data." ;; To add support for your favorite checksum program add a clause to ;; the cond statement in mh-checksum-choose. This should set the ;; variable mh-checksum-cmd to the command line needed to run the -;; checsum program and should set mh-checksum-parser to a function +;; checksum program and should set mh-checksum-parser to a function ;; which returns a cons cell containing the message number and ;; checksum string. diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index 38785fc48e8..fa057aee36f 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -51,7 +51,7 @@ ;; - choose-completion doesn't know how to quote the text it inserts. ;; E.g. it fails to double the dollars in file-name completion, or ;; to backslash-escape spaces and other chars in comint completion. -;; - when completing ~/tmp/fo$$o, the highligting in *Completions* +;; - when completing ~/tmp/fo$$o, the highlighting in *Completions* ;; is off by one position. ;; - all code like PCM which relies on all-completions to match ;; its argument gets confused because all-completions returns unquoted diff --git a/lisp/mpc.el b/lisp/mpc.el index 40ccb456400..238e8ad68ae 100644 --- a/lisp/mpc.el +++ b/lisp/mpc.el @@ -2358,7 +2358,7 @@ This is used so that they can be compared with `eq', which is needed for (let* ((currenttime (float-time)) (last-time (- currenttime (car mpc-last-seek-time)))) (if (< last-time (* 0.9 repeat-delay)) - nil ;; Trottle + nil ;; Throttle (let* ((status (if (< last-time 1.0) mpc-status (mpc-cmd-status))) (songid (cdr (assq 'songid status))) diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el index 488a4fdb976..cbad30199d7 100644 --- a/lisp/net/ange-ftp.el +++ b/lisp/net/ange-ftp.el @@ -4027,7 +4027,7 @@ E.g., (concat bestmatch "/") bestmatch))))) -;; Put these lines uncommmented in your .emacs if you want C-r to refresh +;; Put these lines uncommented in your .emacs if you want C-r to refresh ;; ange-ftp's cache whilst doing filename completion. ;; ;;(define-key minibuffer-local-completion-map "\C-r" 'ange-ftp-re-read-dir) @@ -4507,7 +4507,7 @@ NEWNAME should be the name to give the new compressed or uncompressed file.") ;; We used to follow symlinks on `file' here. Apparently it was done ;; because some FTP servers react to "ls foo" by listing the symlink foo ;; rather than the directory it points to. Now that ange-ftp-ls uses - ;; "cd foo; ls" instead, this is not necesssary any more. + ;; "cd foo; ls" instead, this is not necessary any more. (let ((beg (point)) (end (point-marker))) (set-marker-insertion-type end t) diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 10a1fa5afc5..b55884ff180 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -100,7 +100,7 @@ ;; <URL:ftp://ftp.lysator.liu.se/pub/sgml>; hm--html-menus can be used ;; with this. -;; This package generalises function html-previewer-process in Marc +;; This package generalizes function html-previewer-process in Marc ;; Andreessen's html-mode (LCD modes/html-mode.el.Z). See also the ;; ffap.el package. The huge hyperbole package also contains similar ;; functions. @@ -389,7 +389,7 @@ Defaults to the value of `browse-url-epiphany-arguments' at the time :type '(repeat (string :tag "Argument")) :group 'browse-url) -;; GNOME means of invoking either Mozilla or Netrape. +;; GNOME means of invoking either Mozilla or Netscape. (defvar browse-url-gnome-moz-program "gnome-moz-remote") (defcustom browse-url-gnome-moz-arguments '() diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index ba7d7115ffc..03b84a45ea3 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -145,7 +145,7 @@ association to the service from D-Bus." (service (car value)) (entry (gethash key dbus-registered-objects-table)) ret) - ;; key has the structure (BUS INTERRFACE MEMBER). + ;; key has the structure (BUS INTERFACE MEMBER). ;; value has the structure (SERVICE PATH [HANDLER]). ;; entry has the structure ((UNAME SERVICE PATH MEMBER [RULE]) ...). ;; MEMBER is either a string (the handler), or a cons cell (a @@ -505,7 +505,7 @@ not well formed." (defun dbus-event-member-name (event) "Return the member name the event is coming from. -It is either a signal name or a method name. The result is is a +It is either a signal name or a method name. The result is a string. EVENT is a D-Bus event, see `dbus-check-event'. This function raises a `dbus-error' signal in case the event is not well formed." diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el index 64b2d34af9c..1f6c4464808 100644 --- a/lisp/net/eudc-hotlist.el +++ b/lisp/net/eudc-hotlist.el @@ -53,7 +53,7 @@ These are the special commands of this mode: s -- Select the server at point. t -- Transpose the server at point and the previous one q -- Commit the changes and quit. - x -- Quit without commiting the changes." + x -- Quit without committing the changes." (interactive) (kill-all-local-variables) (setq major-mode 'eudc-hotlist-mode) diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el index 8c4bbb4a785..68a0a6a85d4 100644 --- a/lisp/net/mairix.el +++ b/lisp/net/mairix.el @@ -51,7 +51,7 @@ ;; Currently, RMail, Gnus (with mbox files), and VM are supported as ;; mail programs, but it is pretty easy to interface it with other ;; ones as well. Please see the docs and the source for details. -;; In a nutshell: include your favourite mail program in +;; In a nutshell: include your favorite mail program in ;; `mairix-mail-program' and write functions for ;; `mairix-display-functions' and `mairix-get-mail-header-functions'. ;; If you have written such functions for your Emacs mail program of @@ -945,4 +945,3 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n") (provide 'mairix) ;;; mairix.el ends here - diff --git a/lisp/net/newst-plainview.el b/lisp/net/newst-plainview.el index 906044079cd..16b36df07f8 100644 --- a/lisp/net/newst-plainview.el +++ b/lisp/net/newst-plainview.el @@ -783,11 +783,11 @@ Return new buffer position." (newsticker--buffer-set-uptodate nil) (newsticker--ticker-text-setup) (newsticker-buffer-update) - ;; go back to where we came frome + ;; Go back to where we came from. (goto-char pos) (end-of-line) (newsticker--buffer-goto '(feed) nil t)))) - + (defun newsticker-mark-all-items-at-point-as-read () "Mark all items as read and clear ticker contents." (interactive) diff --git a/lisp/net/newst-treeview.el b/lisp/net/newst-treeview.el index 5e38a905ad5..7cfdd2cb89d 100644 --- a/lisp/net/newst-treeview.el +++ b/lisp/net/newst-treeview.el @@ -227,7 +227,7 @@ their id stays constant." (string= (widget-get node1 :tag) (widget-get node2 :tag))))) (defun newsticker--treeview-do-get-node-of-feed (feed-name startnode) - "Recursivly search node for feed FEED-NAME starting from STARTNODE." + "Recursively search node for feed FEED-NAME starting from STARTNODE." ;;(message "%s/%s" feed-name (widget-get startnode :nt-feed)) (if (string= feed-name (or (widget-get startnode :nt-feed) (widget-get startnode :nt-vfeed))) @@ -245,7 +245,7 @@ their id stays constant." newsticker--treeview-vfeed-tree))) (defun newsticker--treeview-do-get-node (id startnode) - "Recursivly search node with ID starting from STARTNODE." + "Recursively search node with ID starting from STARTNODE." (if (newsticker--treeview-ids-eq id (widget-get startnode :nt-id)) (throw 'found startnode) (let ((children (widget-get startnode :children))) diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el index 3a2cf3f04f7..0a1e07e63f1 100644 --- a/lisp/net/newsticker.el +++ b/lisp/net/newsticker.el @@ -106,7 +106,7 @@ ;; asynchronous download of headlines. The modeline in the `*newsticker*' ;; buffer informs whenever new headlines have arrived. Clicking ;; mouse-button 2 or pressing RET in this buffer on a headline will call -;; browse-url to load the corresponding news story in your favourite web +;; browse-url to load the corresponding news story in your favorite web ;; browser. ;; The scrolling, or flashing of headlines in the echo area, can be started diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el index 3f1437f0799..7a1e5fc6a80 100644 --- a/lisp/net/quickurl.el +++ b/lisp/net/quickurl.el @@ -26,7 +26,7 @@ ;; ;; This package provides a simple method of inserting a URL based on the ;; text at point in the current buffer. This is part of an on-going effort -;; to increase the information I provide people while reducing the ammount +;; to increase the information I provide people while reducing the amount ;; of typing I need to do. No-doubt there are undiscovered Emacs packages ;; out there that do all of this and do it better, feel free to point me to ;; them, in the mean time I'm having fun playing with Emacs Lisp. @@ -189,7 +189,7 @@ in your ~/.emacs (after loading/requiring quickurl).") "Local keymap for a `quickurl-list-mode' buffer.") (defvar quickurl-list-buffer-name "*quickurl-list*" - "Name for the URL listinig buffer.") + "Name for the URL listing buffer.") (defvar quickurl-list-last-buffer nil "`current-buffer' when `quickurl-list' was called.") diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el index 89378497c36..7e0eaff1dce 100644 --- a/lisp/net/secrets.el +++ b/lisp/net/secrets.el @@ -78,7 +78,7 @@ ;; (secrets-create-collection "my collection") ;; There exists a special collection called "session", which has the -;; lifetime of the corrresponding client session (aka Emacs' +;; lifetime of the corresponding client session (aka Emacs' ;; lifetime). It is created automatically when Emacs uses the Secret ;; Service interface, and it is deleted when Emacs is killed. ;; Therefore, it can be used to store and retrieve secret items @@ -379,7 +379,7 @@ returned, and it will be stored in `secrets-session-path'." (defun secrets-prompt-handler (&rest args) "Handler for signals emitted by `secrets-interface-prompt'." ;; An empty object path is always identified as `secrets-empty-path' - ;; or `nil'. Either we set it explicitely, or it is returned by the + ;; or `nil'. Either we set it explicitly, or it is returned by the ;; "Completed" signal. (if (car args) ;; dismissed (setq secrets-prompt-signal (list secrets-empty-path)) @@ -431,7 +431,7 @@ returned, and it will be stored in `secrets-session-path'." (secrets-get-collections))) (defun secrets-collection-path (collection) - "Return the object path of collection labelled COLLECTION. + "Return the object path of collection labeled COLLECTION. If COLLECTION is nil, return the session collection path. If there is no such COLLECTION, return nil." (or @@ -454,7 +454,7 @@ If there is no such COLLECTION, return nil." (throw 'collection-found collection-path)))))) (defun secrets-create-collection (collection) - "Create collection labelled COLLECTION if it doesn't exist. + "Create collection labeled COLLECTION if it doesn't exist. Return the D-Bus object path for collection." (let ((collection-path (secrets-collection-path collection))) ;; Create the collection. @@ -480,7 +480,7 @@ For the time being, only the alias \"default\" is supported." "Label")) (defun secrets-set-alias (collection alias) - "Set ALIAS as alias of collection labelled COLLECTION. + "Set ALIAS as alias of collection labeled COLLECTION. For the time being, only the alias \"default\" is supported." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) @@ -497,7 +497,7 @@ For the time being, only the alias \"default\" is supported." alias :object-path secrets-empty-path)) (defun secrets-unlock-collection (collection) - "Unlock collection labelled COLLECTION. + "Unlock collection labeled COLLECTION. If successful, return the object path of the collection." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) @@ -509,7 +509,7 @@ If successful, return the object path of the collection." collection-path)) (defun secrets-delete-collection (collection) - "Delete collection labelled COLLECTION." + "Delete collection labeled COLLECTION." (let ((collection-path (secrets-collection-path collection))) (unless (secrets-empty-path collection-path) (secrets-prompt @@ -636,7 +636,7 @@ The object path of the created item is returned." (car result))))) (defun secrets-item-path (collection item) - "Return the object path of item labelled ITEM in COLLECTION. + "Return the object path of item labeled ITEM in COLLECTION. If there is no such item, return nil." (let ((collection-path (secrets-unlock-collection collection))) (catch 'item-found @@ -645,7 +645,7 @@ If there is no such item, return nil." (throw 'item-found item-path)))))) (defun secrets-get-secret (collection item) - "Return the secret of item labelled ITEM in COLLECTION. + "Return the secret of item labeled ITEM in COLLECTION. If there is no such item, return nil." (let ((item-path (secrets-item-path collection item))) (unless (secrets-empty-path item-path) @@ -656,7 +656,7 @@ If there is no such item, return nil." "GetSecret" :object-path secrets-session-path)))))) (defun secrets-get-attributes (collection item) - "Return the lookup attributes of item labelled ITEM in COLLECTION. + "Return the lookup attributes of item labeled ITEM in COLLECTION. If there is no such item, or the item has no attributes, return nil." (unless (stringp collection) (setq collection "default")) (let ((item-path (secrets-item-path collection item))) @@ -669,7 +669,7 @@ If there is no such item, or the item has no attributes, return nil." secrets-interface-item "Attributes"))))) (defun secrets-get-attribute (collection item attribute) - "Return the value of ATTRIBUTE of item labelled ITEM in COLLECTION. + "Return the value of ATTRIBUTE of item labeled ITEM in COLLECTION. If there is no such item, or the item doesn't own this attribute, return nil." (cdr (assoc attribute (secrets-get-attributes collection item)))) @@ -774,7 +774,7 @@ to their attributes." (cons (1+ (length "password")) (mapcar - ;; Atribute names have a leading ":", which will be suppressed. + ;; Attribute names have a leading ":", which will be suppressed. (lambda (attribute) (length (symbol-name (car attribute)))) attributes))))) (cons diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el index e9783d46ba8..8112ed5b177 100644 --- a/lisp/net/snmp-mode.el +++ b/lisp/net/snmp-mode.el @@ -676,7 +676,7 @@ controls whether case is significant." ;; v2 SMI TEXTUAL-CONVENTION macro template ;; (tempo-define-template "snmpv2-textual-convention" - '(> (P "Texual Convention Type: ") " ::= TEXTUAL-CONVENTION" n> + '(> (P "Textual Convention Type: ") " ::= TEXTUAL-CONVENTION" n> "STATUS " (if tempo-interactive (snmp-completing-read "Status: " snmp-mode-status-list nil t) diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el index 42c698876cd..74f51d148ef 100644 --- a/lisp/net/soap-client.el +++ b/lisp/net/soap-client.el @@ -32,7 +32,7 @@ ;; `soap-invoke' method passing it the WSDL, the service name, the operation ;; you wish to invoke and any required parameters. ;; -;; Idealy, the service you want to access will have some documentation about +;; Ideally, the service you want to access will have some documentation about ;; the operations it supports. If it does not, you can try using ;; `soap-inspect' to browse the WSDL document and see the available operations ;; and their parameters. @@ -373,7 +373,7 @@ binding) but the same name." (defstruct (soap-sequence-type (:include soap-element)) parent ; OPTIONAL WSDL-TYPE name - elements ; LIST of SOAP-SEQUCENCE-ELEMENT + elements ; LIST of SOAP-SEQUENCE-ELEMENT ) (defstruct (soap-array-type (:include soap-element)) diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index b35ca3bbd18..56087a3aef6 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -162,6 +162,11 @@ FILE must be a local file name on a connection identified via VEC." ;;;###tramp-autoload (defun tramp-flush-file-property (vec file) "Remove all properties of FILE in the cache context of VEC." + ;; Remove file property of symlinks. + (let ((truename (tramp-get-file-property vec file "file-truename" nil))) + (when (and (stringp truename) + (not (string-equal file truename))) + (tramp-flush-file-property vec truename))) ;; Unify localname. (setq vec (copy-sequence vec)) (aset vec 3 (tramp-run-real-handler 'directory-file-name (list file))) diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index 5054f1d232d..89c7db241d8 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -412,7 +412,7 @@ element is not omitted." (program &optional infile destination display &rest args) "Calls `call-process' on the local host. This is needed because for some Emacs flavors Tramp has -defadviced `call-process' to behave like `process-file'. The +defadvised `call-process' to behave like `process-file'. The Lisp error raised when PROGRAM is nil is trapped also, returning 1." (let ((default-directory (if (file-remote-p default-directory) diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 55732194bc8..50a3c1fca5e 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -549,7 +549,7 @@ as given in your `~/.profile'." "*List of environment variables to be set on the remote host. Each element should be a string of the form ENVVARNAME=VALUE. An -entry ENVVARNAME= diables the corresponding environment variable, +entry ENVVARNAME= disables the corresponding environment variable, which might have been set in the init files like ~/.profile. Special handling is applied to the PATH environment, which should @@ -1058,106 +1058,110 @@ target of the symlink differ." (defun tramp-sh-handle-file-truename (filename &optional counter prev-dirs) "Like `file-truename' for Tramp files." (with-parsed-tramp-file-name (expand-file-name filename) nil - (with-file-property v localname "file-truename" - (let ((result nil)) ; result steps in reverse order - (tramp-message v 4 "Finding true name for `%s'" filename) - (cond - ;; Use GNU readlink --canonicalize-missing where available. - ((tramp-get-remote-readlink v) - (setq result - (tramp-send-command-and-read - v - (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" - (tramp-get-remote-readlink v) - (tramp-shell-quote-argument localname))))) - - ;; Use Perl implementation. - ((and (tramp-get-remote-perl v) - (tramp-get-connection-property v "perl-file-spec" nil) - (tramp-get-connection-property v "perl-cwd-realpath" nil)) - (tramp-maybe-send-script - v tramp-perl-file-truename "tramp_perl_file_truename") - (setq result - (tramp-send-command-and-read - v - (format "tramp_perl_file_truename %s" - (tramp-shell-quote-argument localname))))) - - ;; Do it yourself. We bind `directory-sep-char' here for - ;; XEmacs on Windows, which would otherwise use backslash. - (t (let* ((directory-sep-char ?/) - (steps (tramp-compat-split-string localname "/")) - (localnamedir (tramp-run-real-handler - 'file-name-as-directory (list localname))) - (is-dir (string= localname localnamedir)) - (thisstep nil) - (numchase 0) - ;; Don't make the following value larger than - ;; necessary. People expect an error message in a - ;; timely fashion when something is wrong; - ;; otherwise they might think that Emacs is hung. - ;; Of course, correctness has to come first. - (numchase-limit 20) - symlink-target) - (while (and steps (< numchase numchase-limit)) - (setq thisstep (pop steps)) - (tramp-message - v 5 "Check %s" - (mapconcat 'identity - (append '("") (reverse result) (list thisstep)) - "/")) - (setq symlink-target - (nth 0 (file-attributes - (tramp-make-tramp-file-name - method user host - (mapconcat 'identity - (append '("") - (reverse result) - (list thisstep)) - "/"))))) - (cond ((string= "." thisstep) - (tramp-message v 5 "Ignoring step `.'")) - ((string= ".." thisstep) - (tramp-message v 5 "Processing step `..'") - (pop result)) - ((stringp symlink-target) - ;; It's a symlink, follow it. - (tramp-message v 5 "Follow symlink to %s" symlink-target) - (setq numchase (1+ numchase)) - (when (file-name-absolute-p symlink-target) - (setq result nil)) - ;; If the symlink was absolute, we'll get a string like - ;; "/user@host:/some/target"; extract the - ;; "/some/target" part from it. - (when (tramp-tramp-file-p symlink-target) - (unless (tramp-equal-remote filename symlink-target) - (tramp-error - v 'file-error - "Symlink target `%s' on wrong host" symlink-target)) - (setq symlink-target localname)) - (setq steps - (append (tramp-compat-split-string - symlink-target "/") - steps))) - (t - ;; It's a file. - (setq result (cons thisstep result))))) - (when (>= numchase numchase-limit) - (tramp-error - v 'file-error - "Maximum number (%d) of symlinks exceeded" numchase-limit)) - (setq result (reverse result)) - ;; Combine list to form string. - (setq result - (if result - (mapconcat 'identity (cons "" result) "/") - "/")) - (when (and is-dir (or (string= "" result) - (not (string= (substring result -1) "/")))) - (setq result (concat result "/")))))) - - (tramp-message v 4 "True name of `%s' is `%s'" filename result) - (tramp-make-tramp-file-name method user host result))))) + (tramp-make-tramp-file-name method user host + (with-file-property v localname "file-truename" + (let ((result nil)) ; result steps in reverse order + (tramp-message v 4 "Finding true name for `%s'" filename) + (cond + ;; Use GNU readlink --canonicalize-missing where available. + ((tramp-get-remote-readlink v) + (setq result + (tramp-send-command-and-read + v + (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" + (tramp-get-remote-readlink v) + (tramp-shell-quote-argument localname))))) + + ;; Use Perl implementation. + ((and (tramp-get-remote-perl v) + (tramp-get-connection-property v "perl-file-spec" nil) + (tramp-get-connection-property v "perl-cwd-realpath" nil)) + (tramp-maybe-send-script + v tramp-perl-file-truename "tramp_perl_file_truename") + (setq result + (tramp-send-command-and-read + v + (format "tramp_perl_file_truename %s" + (tramp-shell-quote-argument localname))))) + + ;; Do it yourself. We bind `directory-sep-char' here for + ;; XEmacs on Windows, which would otherwise use backslash. + (t (let* ((directory-sep-char ?/) + (steps (tramp-compat-split-string localname "/")) + (localnamedir (tramp-run-real-handler + 'file-name-as-directory (list localname))) + (is-dir (string= localname localnamedir)) + (thisstep nil) + (numchase 0) + ;; Don't make the following value larger than + ;; necessary. People expect an error message in + ;; a timely fashion when something is wrong; + ;; otherwise they might think that Emacs is hung. + ;; Of course, correctness has to come first. + (numchase-limit 20) + symlink-target) + (while (and steps (< numchase numchase-limit)) + (setq thisstep (pop steps)) + (tramp-message + v 5 "Check %s" + (mapconcat 'identity + (append '("") (reverse result) (list thisstep)) + "/")) + (setq symlink-target + (nth 0 (file-attributes + (tramp-make-tramp-file-name + method user host + (mapconcat 'identity + (append '("") + (reverse result) + (list thisstep)) + "/"))))) + (cond ((string= "." thisstep) + (tramp-message v 5 "Ignoring step `.'")) + ((string= ".." thisstep) + (tramp-message v 5 "Processing step `..'") + (pop result)) + ((stringp symlink-target) + ;; It's a symlink, follow it. + (tramp-message + v 5 "Follow symlink to %s" symlink-target) + (setq numchase (1+ numchase)) + (when (file-name-absolute-p symlink-target) + (setq result nil)) + ;; If the symlink was absolute, we'll get a + ;; string like "/user@host:/some/target"; + ;; extract the "/some/target" part from it. + (when (tramp-tramp-file-p symlink-target) + (unless (tramp-equal-remote filename symlink-target) + (tramp-error + v 'file-error + "Symlink target `%s' on wrong host" + symlink-target)) + (setq symlink-target localname)) + (setq steps + (append (tramp-compat-split-string + symlink-target "/") + steps))) + (t + ;; It's a file. + (setq result (cons thisstep result))))) + (when (>= numchase numchase-limit) + (tramp-error + v 'file-error + "Maximum number (%d) of symlinks exceeded" numchase-limit)) + (setq result (reverse result)) + ;; Combine list to form string. + (setq result + (if result + (mapconcat 'identity (cons "" result) "/") + "/")) + (when (and is-dir + (or (string= "" result) + (not (string= (substring result -1) "/")))) + (setq result (concat result "/")))))) + + (tramp-message v 4 "True name of `%s' is `%s'" localname result) + result))))) ;; Basic functions. @@ -4307,7 +4311,7 @@ connection if a previous connection has died for some reason." (tramp-compat-temporary-file-directory))))) spec) - ;; Add arguments for asynchrononous processes. + ;; Add arguments for asynchronous processes. (when (and process-name async-args) (setq login-args (append async-args login-args))) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 5fca1018095..0ee6ad8dea4 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -152,7 +152,7 @@ local host, so if you want to use `~' in those commands, you should choose a shell here which groks tilde expansion. `/bin/sh' normally does not understand tilde expansion. -For encoding and deocding, commands like the following are executed: +For encoding and decoding, commands like the following are executed: /bin/sh -c COMMAND < INPUT > OUTPUT @@ -3851,7 +3851,7 @@ Only works for Bourne-like shells." ;; expects English? Or just to set LC_MESSAGES to "C" if Tramp ;; expects only English messages? (Juri Linkov) ;; * Make shadowfile.el grok Tramp filenames. (Bug#4526, Bug#4846) -;; * I was wondering it it would be possible to use tramp even if I'm +;; * I was wondering if it would be possible to use tramp even if I'm ;; actually using sshfs. But when I launch a command I would like ;; to get it executed on the remote machine where the files really ;; are. (Andrea Crotti) diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el index 3a2560b3c61..6ef24e9f354 100644 --- a/lisp/net/webjump.el +++ b/lisp/net/webjump.el @@ -235,7 +235,7 @@ "www.faqs.org/faqs/") ("RTFM Usenet FAQs by Group" . "ftp://rtfm.mit.edu/pub/usenet-by-group/") - ("RTFM Usenet FAQs by Hierachy" . + ("RTFM Usenet FAQs by Hierarchy" . "ftp://rtfm.mit.edu/pub/usenet-by-hierarchy/") ("X Consortium Archive" . "ftp.x.org") diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el index 56e9cb68c61..efb2cdd6166 100644 --- a/lisp/net/xesam.el +++ b/lisp/net/xesam.el @@ -409,7 +409,7 @@ If there is no registered search engine at all, the function returns `nil'." (setq vendor-id (xesam-get-property engine "vendor.id") hit-fields (xesam-get-property engine "hit.fields")) - ;; Ususally, `hit.fields' shall describe supported fields. + ;; Usually, `hit.fields' shall describe supported fields. ;; That is not the case now, so we set it ourselves. ;; Hopefully, this will change later. (setq hit-fields diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el index d801a4c094c..cc538c224dc 100644 --- a/lisp/net/zeroconf.el +++ b/lisp/net/zeroconf.el @@ -249,7 +249,7 @@ qualified name, i.e., it contains DOMAIN. APROTOCOL stands for the network protocol family ADDRESS is encoded (`zeroconf-avahi-protocol-inet4' means INET4, `zeroconf-avahi-protocol-inet6' means INET6). It can be -different from PROTOCOL, when an adrress resolution has been +different from PROTOCOL, when an address resolution has been requested for another protocol family but the default one. ADDRESS is the service address, encoded according to the @@ -486,7 +486,7 @@ TYPE. The resulting list has the format (nth 9 (zeroconf-resolve-service service))) -;;; Services signalling. +;;; Services signaling. ;; Register for the service type browser. Service registrations will ;; happen in `zeroconf-service-type-browser-handler', when there is an diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el index 6a2a9daf7e4..53d2cabc2e5 100644 --- a/lisp/nxml/nxml-outln.el +++ b/lisp/nxml/nxml-outln.el @@ -60,7 +60,7 @@ ;; form. Single-line form is used when the outline state is hide-children ;; or there are no child sections; multi-line form is used otherwise. ;; There are two flavors of single-line form: with children and without. -;; The with-childen flavor is used when there are child sections. +;; The with-children flavor is used when there are child sections. ;; Single line with children looks like ;; <+section>A section title...</> ;; Single line without children looks like diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el index cb06091dfcf..347db281f1a 100644 --- a/lisp/obsolete/iso-acc.el +++ b/lisp/obsolete/iso-acc.el @@ -32,7 +32,7 @@ ;; In `iso-accents-mode', pseudo accent characters are used to ;; introduce accented keys. The pseudo-accent characters are: ;; -;; ' (minute) -> actue accent +;; ' (minute) -> acute accent ;; ` (backtick) -> grave accent ;; " (second) -> diaeresis ;; ^ (caret) -> circumflex diff --git a/lisp/obsolete/pgg-gpg.el b/lisp/obsolete/pgg-gpg.el index 064985f4566..2eafc631e98 100644 --- a/lisp/obsolete/pgg-gpg.el +++ b/lisp/obsolete/pgg-gpg.el @@ -384,7 +384,7 @@ passphrase cache or user." (pgg-process-when-success))) (defun pgg-gpg-update-agent () - "Try to connet to gpg-agent and send UPDATESTARTUPTTY." + "Try to connect to gpg-agent and send UPDATESTARTUPTTY." (if (fboundp 'make-network-process) (let* ((agent-info (getenv "GPG_AGENT_INFO")) (socket (and agent-info diff --git a/lisp/obsolete/s-region.el b/lisp/obsolete/s-region.el index b06861c0efc..8fb6703aa25 100644 --- a/lisp/obsolete/s-region.el +++ b/lisp/obsolete/s-region.el @@ -4,7 +4,7 @@ ;; Author: Morten Welinder <terra@diku.dk> ;; Keywords: terminals -;; Favourite-brand-of-beer: None, I hate beer. +;; Favorite-brand-of-beer: None, I hate beer. ;; Obsolete-since: 24.1 ;; This file is part of GNU Emacs. diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index ae150621dc0..b946d147e5b 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,19 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * org-agenda.el (org-agenda-add-entry-text-descriptive-links) + (org-agenda-custom-commands, org-write-agenda, org-check-for-org-mode) + (org-search-syntax-table, org-modify-diary-entry-string) + (org-write-agenda): + * org-bbdb.el (org-bbdb-anniv-export-ical): + * org-bibtex.el (org-bibtex-fields): + * org-icalendar.el (org-icalendar-date-time-format): + * org-latex.el (org-export-latex-inline-image-extensions): + * org-list.el (org-list-insert-item): Fix typos. + +2011-11-11 Juanma Barranquero <lekktu@gmail.com> + + * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring. + 2011-09-27 Eli Zaretskii <eliz@gnu.org> * org.el (org-mode): Force left-to-right paragraphs in Org @@ -51,7 +67,7 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-publish.el (org-publish-index-generate-theindex): rename + * org-publish.el (org-publish-index-generate-theindex): Rename from `org-publish-index-generate-theindex.inc'. Use the file theindex.org directly instead of including theindex.inc. (org-publish-projects): Don't delete .orgx files. @@ -131,7 +147,7 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org.el (org-timestamp-change): keep point in the same category + * org.el (org-timestamp-change): Keep point in the same category when updating a time-stamp. This requires to be careful, as, depending on the locale, name of day might change of length during the process. @@ -582,7 +598,7 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org.el (org-in-block-p): new function. + * org.el (org-in-block-p): New function. * org-footnote.el (org-footnote-forbidden-blocks): New variable. (org-footnote-in-valid-context-p): New function. @@ -876,131 +892,131 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-action): offer to create + * org-footnote.el (org-footnote-action): Offer to create definition when none is found. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-re): avoid matching inactive + * org-footnote.el (org-footnote-re): Avoid matching inactive time-stamps or check-box cookies. - (org-footnote-next-reference-or-definition): adapt to the new regexp. + (org-footnote-next-reference-or-definition): Adapt to the new regexp. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-exp.el (org-export-preprocess-string): if the last subtree + * org-exp.el (org-export-preprocess-string): If the last subtree is commented, footnotes inserted during normalizing at the end of the buffer may get deleted. This patch ensures deletion comes first, normalization second. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-exp.el (org-export-footnotes-data): change docstring. - (org-export-footnotes-seen): renamed from + * org-exp.el (org-export-footnotes-data): Change docstring. + (org-export-footnotes-seen): Rename from org-export-footnotes-markers. - * org-ascii.el (org-export-as-ascii): apply change. + * org-ascii.el (org-export-as-ascii): Apply change. - * org-docbook.el (org-export-as-docbook): apply change. + * org-docbook.el (org-export-as-docbook): Apply change. - * org-footnote.el (org-footnote-normalize): apply change. + * org-footnote.el (org-footnote-normalize): Apply change. - * org-html.el (org-export-as-html): apply change. + * org-html.el (org-export-as-html): Apply change. - * org-latex.el (org-export-as-latex): apply change. + * org-latex.el (org-export-as-latex): Apply change. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-latex.el (org-export-latex-preprocess): rely on + * org-latex.el (org-export-latex-preprocess): Rely on `org-export-footnotes-markers' to retreive definition of the current footnote during export. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-normalize): remember footnotes + * org-footnote.el (org-footnote-normalize): Remember footnotes seen so far by the exporter when choosing the new marker. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-normalize): make use of + * org-footnote.el (org-footnote-normalize): Make use of `org-footnote-insert-pos-for-preprocessor'. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-normalize): add `org-footnote' + * org-footnote.el (org-footnote-normalize): Add `org-footnote' property to footnote markers when preparing for exportation. - * org-html.el (org-export-as-html): read new property to decide + * org-html.el (org-export-as-html): Read new property to decide when to export a footnote. - * org-docbook.el (org-export-as-docbook): read new property to + * org-docbook.el (org-export-as-docbook): Read new property to decide when to export a footnote. - * org-latex.el (org-export-latex-preprocess): ensure footnote at + * org-latex.el (org-export-latex-preprocess): Ensure footnote at column 0 cannot end a list containing it by adding `original-indentation' property to it. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-exp.el (org-export-preprocess-string): normalize footnotes + * org-exp.el (org-export-preprocess-string): Normalize footnotes before marking lists ending. - * org-latex.el (org-export-latex-preprocess): work with labels as + * org-latex.el (org-export-latex-preprocess): Work with labels as strings and not as numbers. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-docbook.el (org-export-docbook-footnote-separator): new - variable - (org-export-as-docbook): add a separator between footnotes. + * org-docbook.el (org-export-docbook-footnote-separator): New + variable. + (org-export-as-docbook): Add a separator between footnotes. - * org-html.el (org-export-html-footnote-separator): new variable. - (org-export-as-html): add a separator between footnotes. + * org-html.el (org-export-html-footnote-separator): New variable. + (org-export-as-html): Add a separator between footnotes. - * org-latex.el (org-export-latex-footnote-separator): new + * org-latex.el (org-export-latex-footnote-separator): New variable. - (org-export-latex-preprocess): add a separator between footnotes. + (org-export-latex-preprocess): Add a separator between footnotes. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> * org-exp.el (org-export-footnotes-markers) - (org-export-footnotes-data): new variables. - (org-export-preprocess-string): use a more explicit argument. + (org-export-footnotes-data): New variables. + (org-export-preprocess-string): Use a more explicit argument. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-goto-definition): now, determining + * org-footnote.el (org-footnote-goto-definition): Now, determining if point is at a footnote reference is entirely determined by `org-footnote-at-reference-p'. No need to check if pattern isn't at beginning of the line elsewhere. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-next-reference-or-definition): new + * org-footnote.el (org-footnote-next-reference-or-definition): New function. - * org.el (org-activate-footnote-links): activate the whole + * org.el (org-activate-footnote-links): Activate the whole footnote, but only fontify its label. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-normalize): make use of changes to + * org-footnote.el (org-footnote-normalize): Make use of changes to `org-footnote-at-reference-p' and creation of various functions.. Also comment code. - (org-footnote-get-next-reference, org-footnote-delete-references, - org-footnote-delete-definitions): new functions - (org-footnote-goto-previous-reference, org-footnote-all-labels, - org-insert-footnote-reference-near-definition, org-footnote-delete): - rewrite to use org-footnote-get-next-reference. + (org-footnote-get-next-reference, org-footnote-delete-references) + (org-footnote-delete-definitions): New functions. + (org-footnote-goto-previous-reference, org-footnote-all-labels) + (org-insert-footnote-reference-near-definition, org-footnote-delete): + Rewrite to use org-footnote-get-next-reference. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-footnote.el (org-footnote-re): don't end an inline footnote + * org-footnote.el (org-footnote-re): Don't end an inline footnote at unrelated closing square brackets. - (org-footnote-at-reference-p): improve accuracy of the function to + (org-footnote-at-reference-p): Improve accuracy of the function to determine if point is at a reference and to extract definition of an inline footnote. - (org-footnote-all-labels, org-footnote-action, org-footnote-delete, - org-footnote-auto-adjust-maybe): make use of previous function. + (org-footnote-all-labels, org-footnote-action, org-footnote-delete) + (org-footnote-auto-adjust-maybe): Make use of previous function. 2011-07-28 Bastien Guerry <bzg@gnu.org> @@ -1054,14 +1070,14 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-list.el (org-cycle-item-indentation): cycling back to + * org-list.el (org-cycle-item-indentation): Cycling back to original position deleted any additional information in the item, like a counter or a tag. 2011-07-28 Pieter Praet <pieter@praet.org> * org-crypt.el (org-crypt-disable-auto-save): New defcustom. - (org-decrypt-entry): before decrypting, check whether + (org-decrypt-entry): Before decrypting, check whether `auto-save-mode' is enabled for the current buffer, and act on it according to how `org-crypt-disable-auto-save' is set. Remove comment re "encrypt[ing] Org auto-saved buffers". Remove on-init @@ -1245,29 +1261,29 @@ 2011-07-28 Eric Schulte <schulte.eric@gmail.com> - * ob-C.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-C.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-asymptote.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-asymptote.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-awk.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-awk.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-clojure.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-clojure.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-haskell.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-haskell.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-latex.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-latex.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-lisp.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-lisp.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-ocaml.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-ocaml.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-perl.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-perl.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-python.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-python.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-ruby.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-ruby.el (ob-tangle): Initialize variable from `ob-tangle'. - * ob-tangle.el (ob-tangle): initialize variable from `ob-tangle'. + * ob-tangle.el (ob-tangle): Initialize variable from `ob-tangle'. 2011-07-28 Eric Schulte <schulte.eric@gmail.com> @@ -1290,12 +1306,12 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-list.el (org-reset-checkbox-state-subtree): make the command + * org-list.el (org-reset-checkbox-state-subtree): Make the command more robust, and correctly update check-boxes in the whole sub-tree. - (org-update-checkbox-count): fix bug accumulating count of checkboxes + (org-update-checkbox-count): Fix bug accumulating count of checkboxes when walking a subtree. - (org-update-checkbox-count-maybe): add an optional argument passed to + (org-update-checkbox-count-maybe): Add an optional argument passed to org-update-checkbox-count. 2011-07-28 Ted Zlatanov <tzz@lifelogs.com> @@ -1321,9 +1337,9 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-list.el (org-list-parse-list): replace transitional + * org-list.el (org-list-parse-list): Replace transitional check-boxes with "[CBTRANS]" string during parsing. - (org-list-to-generic): use the new property `:cbtrans' to configure + (org-list-to-generic): Use the new property `:cbtrans' to configure export string for transitional check-boxes. 2011-07-28 Carsten Dominik <carsten.dominik@gmail.com> @@ -1965,7 +1981,7 @@ 2011-07-28 Carsten Dominik <carsten.dominik@gmail.com> - * org-latex.el (org-export-latex-preprocess): Protect index string + * org-latex.el (org-export-latex-preprocess): Protect index string. 2011-07-28 Carsten Dominik <carsten.dominik@gmail.com> @@ -2119,11 +2135,11 @@ (org-bibtex-headline): Make use of new `org-bibtex-export-arbitrary-fields' and `org-bibtex-key-property' variables. - (org-bibtex-autokey): Make use of new `org-bibtex-key-property' + (org-bibtex-autokey): Make use of new `org-bibtex-key-property' variable. - (org-bibtex-fleshout): Make use of new `org-bibtex-key-property' + (org-bibtex-fleshout): Make use of new `org-bibtex-key-property' variable. - (org-bibtex-write): Make use of new `org-bibtex-key-property' + (org-bibtex-write): Make use of new `org-bibtex-key-property' variable. 2011-07-28 Eric Schulte <schulte.eric@gmail.com> @@ -2247,7 +2263,7 @@ 2011-07-28 Manuel Giraud <manuel.giraud@univ-nantes.fr> * org-html.el (org-html-handle-links): Add an alternate for inline - images + images. 2011-07-28 Carsten Dominik <carsten.dominik@gmail.com> @@ -2293,7 +2309,7 @@ * ob-python.el (org-babel-python-evaluate-external-process): Allow parsing as a table in the case of ":results output table". - (org-babel-python-evaluate-session): Allow parsing as a table in + (org-babel-python-evaluate-session): Allow parsing as a table in the case of ":results output table". 2011-07-28 Carsten Dominik <carsten.dominik@gmail.com> @@ -2343,7 +2359,7 @@ * org.el (org-set-font-lock-defaults): Be more strict when recognizing description items, and do not fontify wrong cases - like: "- term ::description" or "1. term :: description" + like: "- term ::description" or "1. term :: description". 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> @@ -2789,7 +2805,7 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-html.el (org-export-as-html): fix export of email. + * org-html.el (org-export-as-html): Fix export of email. 2011-07-28 Eric Schulte <schulte.eric@gmail.com> @@ -2810,11 +2826,11 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-crypt.el: remove useless TODO in comments. + * org-crypt.el: Remove useless TODO in comments. 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-html.el (org-export-as-html): the default postamble now only + * org-html.el (org-export-as-html): The default postamble now only export a date paragraph if `org-export-time-stamp-file' is non-nil. @@ -2894,12 +2910,12 @@ 2011-07-28 Bernt Hansen <bernt@norang.ca> * org-clock.el (org-clock-in): Allow clocking in new tasks - inserted before the current clocking task + inserted before the current clocking task. 2011-07-28 Bernt Hansen <bernt@norang.ca> * org-clock.el (org-clock-in): Set default clocking task when - already clocking the task + already clocking the task. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> @@ -2920,9 +2936,9 @@ 2011-07-28 Manuel Giraud <manuel.giraud@univ-nantes.fr> - * org-html.el (org-format-org-table-html): fix anchors in HTML + * org-html.el (org-format-org-table-html): Fix anchors in HTML export (thanks to <aankhen@gmail.com>) - (org-html-protect): fix a bug that prevents some target to be + (org-html-protect): Fix a bug that prevents some target to be rendered correctly. 2011-07-28 Bastien Guerry <bzg@gnu.org> @@ -3007,15 +3023,15 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-capture.el (org-capture-put-target-region-and-position): New - function to store information about the target buffer. + * org-capture.el (org-capture-put-target-region-and-position): + New function to store information about the target buffer. (org-capture-set-target-location): Use it. - (org-capture-finalize): restore the target buffer in its + (org-capture-finalize): Restore the target buffer in its possibly narrowed state. Also restore the cursor position. 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-crypt.el (auto-save-default): make sure entries are + * org-crypt.el (auto-save-default): Make sure entries are encrypted before auto-saving. 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> @@ -3031,7 +3047,7 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org.el (org-narrow-to-subtree): ensure `org-back-to-heading' + * org.el (org-narrow-to-subtree): Ensure `org-back-to-heading' will move point to a real heading and not an inline task by wraping function into a `org-with-limited-levels' macro. @@ -3045,7 +3061,7 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> * org.el (org-refile-get-targets): Rename from - `org-get-refile-targets.' + `org-get-refile-targets'. 2011-07-28 Bastien Guerry <bzg@gnu.org> @@ -3055,7 +3071,7 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-table.el (org-table-fix-formulas-confirm): new custom + * org-table.el (org-table-fix-formulas-confirm): New custom variable. (org-table-insert-column, org-table-delete-column) (org-table-move-column, org-table-move-row) @@ -3085,14 +3101,14 @@ 2011-07-28 Lawrence Mitchell <wence@gmx.li> - * org-latex.el: place \title \author \date before + * org-latex.el: Place \title \author \date before \begin{document}. 2011-07-28 Bastien Guerry <bzg@gnu.org> * org-html.el (org-export-html-preamble) - (org-export-html-postamble): now default to `nil'. - (org-export-as-html): when :html-pre/postamble is nil, fall + (org-export-html-postamble): Now default to `nil'. + (org-export-as-html): When :html-pre/postamble is nil, fall back on the default pre/postamble, which depends on the :author-info, :email-info, :creator-info options. @@ -3113,7 +3129,7 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org.el (org-move-subtree-down): leave the cursor at the same + * org.el (org-move-subtree-down): Leave the cursor at the same column we were at. 2011-07-28 Bastien Guerry <bzg@gnu.org> @@ -3126,7 +3142,7 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-exp.el (org-export-remove-headline-metadata): bugfix: don't + * org-exp.el (org-export-remove-headline-metadata): Bugfix: don't case-fold-search to avoid mixing TODO keywords with real headline words. @@ -3152,7 +3168,7 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> * org-html.el (org-export-html-postamble-format) - (org-export-html-preamble-format): explain how to escape the + (org-export-html-preamble-format): Explain how to escape the `%' character. 2011-07-28 Bastien Guerry <bzg@gnu.org> @@ -3329,14 +3345,14 @@ 2011-07-28 Eric Schulte <schulte.eric@gmail.com> * ob-latex.el (org-babel-execute:latex): Add imagemagick options, - and for file types other than png and pdf it uses imagemagick to - convert a compiled pdf file to the desired file type. - (convert-pdf): Convert a pdf file to a new file type using + and for file types other than png and PDF it uses imagemagick to + convert a compiled PDF file to the desired file type. + (convert-pdf): Convert a PDF file to a new file type using imagemagick. 2011-07-28 Puneeth Chaganti <punchagan@gmail.com> - * org-capture.el (org-capture-fill-template): fix bug with the + * org-capture.el (org-capture-fill-template): Fix bug with the display of interactive prompt in templates expansion. 2011-07-28 Reiner Steib <reiner.steib@gmx.de> @@ -3495,7 +3511,7 @@ * org.el (org-set-autofill-regexps): Use `org-item-re' in `paragraph-start' to recognize alphabetical lists. (org-fill-paragraph): Enforce a pre-computed fill-prefix before - calling `fill-paragraph' when point in in an item. Also prevent + calling `fill-paragraph' when point is in an item. Also prevent paragraphs getting merged into an adjacent list upon filling. (org-adaptive-fill-function): Make sure to determine real fill-prefix for auto-fill. @@ -3593,7 +3609,7 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-list.el (org-list-struct): when a line has org-example + * org-list.el (org-list-struct): When a line has org-example property, skip the entire block. This is needed during export, for example when src blocks in org markup contain lists, and are returned verbatim because org isn't in the list of interpreted @@ -3702,7 +3718,7 @@ * org-capture.el (org-capture-place-item): Reflect changes to `org-item-beginning-re'. - * org-docbook.el (org-export-docbook-list-line): handle New type + * org-docbook.el (org-export-docbook-list-line): Handle New type of items. * org-exp.el (org-export-mark-list-end) @@ -3727,7 +3743,7 @@ (org-in-item-p,org-list-struct,org-list-parse-list): Apply change. * org-exp.el (org-export-mark-list-end) - (org-export-mark-list-properties): Apply change + (org-export-mark-list-properties): Apply change. * org-latex.el (org-export-latex-lists): Apply change. Also prevent items with org-example property to be considered as real @@ -4161,7 +4177,7 @@ 2011-07-28 Bastien Guerry <bzg@gnu.org> - * org-html.el (org-export-as-html): expand the HTML title. + * org-html.el (org-export-as-html): Expand the HTML title. 2011-07-28 Bastien Guerry <bzg@gnu.org> @@ -4774,7 +4790,7 @@ * ob-tangle.el (org-babel-spec-to-string): Adding "noweb" as a linking comment type (org-babel-tangle-comment-links): Returns comment links for the - source code block at point + source code block at point. 2011-07-28 Bastien Guerry <bzg@gnu.org> @@ -4855,7 +4871,7 @@ * org-capture.el (org-capture-templates): Add %f and %F escapes (org-capture): Add more information to capture property list - (org-capture-fill-template): Handle %f and %F escapes + (org-capture-fill-template): Handle %f and %F escapes. 2011-07-28 David Maus <dmaus@ictsoc.de> @@ -4941,7 +4957,7 @@ 2011-07-28 Nicolas Goaziou <n.goaziou@gmail.com> - * org-exp.el (org-export-mark-list-ending): insert additional + * org-exp.el (org-export-mark-list-ending): Insert additional newline characters if end-list-marker is at a wrong position. 2011-07-28 Eric Schulte <schulte.eric@gmail.com> @@ -5003,7 +5019,7 @@ output file. * ob-sass.el (org-babel-execute:sass): Return nil if result has - been written to file + been written to file. 2011-07-28 Dan Davison <dandavison7@gmail.com> @@ -5016,7 +5032,7 @@ with code implementing the writing of graohical output to file. (org-babel-execute:R): Use `org-babel-R-graphical-output-file' to determine whether R is taking responsibility for writing output to - file; if so, this is signalled to ob.el by returning a nil result. + file; if so, this is signaled to ob.el by returning a nil result. 2011-07-28 Dan Davison <dandavison7@gmail.com> @@ -5782,7 +5798,7 @@ 2010-12-11 Nicolas Goaziou <n.goaziou@gmail.com> - * org-exp.el (org-export-preprocess-string): delaying code block + * org-exp.el (org-export-preprocess-string): Delay code block processing a bit to allow correct list parsing in the export string. 2010-12-11 Christopher Allan Webber <cwebber@dustycloud.org> @@ -5839,7 +5855,7 @@ 2010-12-11 Eric Schulte <schulte.eric@gmail.com> - * ob-lob.el (org-babel-lob-get-info): including pass-through + * ob-lob.el (org-babel-lob-get-info): Include pass-through header arguments in results variable header argument string. 2010-12-11 David Maus <dmaus@ictsoc.de> @@ -5863,7 +5879,7 @@ 2010-12-11 Nicolas Goaziou <n.goaziou@gmail.com> - * org.el (org-indent-line-function): simplify code and remove bug that + * org.el (org-indent-line-function): Simplify code and remove bug that would insert a tab at the beginning of the line when trying to indent the item. @@ -5887,7 +5903,7 @@ 2010-12-11 Eric Schulte <schulte.eric@gmail.com> - * ob-calc.el (org-babel-execute:calc): support for variables -- + * ob-calc.el (org-babel-execute:calc): Support for variables -- converts :var variables in calc variables. 2010-12-11 Carsten Dominik <carsten.dominik@gmail.com> @@ -7159,7 +7175,7 @@ src blocks. (org-speed-command-default-hook): The default hook for org-speed-command-hook. Factored out from org-self-insert-command - and mimics existing behaviour. + and mimics existing behavior. (org-self-insert-command): Modified to use org-speed-command-hook. 2010-11-11 Carsten Dominik <carsten.dominik@gmail.com> @@ -7465,7 +7481,7 @@ 2010-11-11 Eric Schulte <schulte.eric@gmail.com> - * ob-tangle.el: autoload org-babel-tangle-lang-exts from ob-tangle. + * ob-tangle.el: Autoload org-babel-tangle-lang-exts from ob-tangle. 2010-11-11 Dan Davison <davison@stats.ox.ac.uk> @@ -8058,7 +8074,7 @@ 2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> * org-list.el (org-insert-item-internal): Guessing of blank lines - number is made by looking at neighbours items, if any. + number is made by looking at neighboring items, if any. 2010-11-11 Nicolas Goaziou <n.goaziou@gmail.com> @@ -8427,7 +8443,7 @@ 2010-11-11 Eric Schulte <schulte.eric@gmail.com> - * ob-scheme.el: very preliminary support for evaluating scheme + * ob-scheme.el: Very preliminary support for evaluating scheme code blocks. * org.el (org-babel-load-languages): Adding scheme. @@ -8537,7 +8553,7 @@ * ob-latex.el (org-babel-execute:latex): Adding new ":fit" and ":border" header arguments which both use the "preview" latex - package to fit the resulting pdf image to the figure. + package to fit the resulting PDF image to the figure. 2010-11-11 David Maus <dmaus@ictsoc.de> @@ -8596,8 +8612,8 @@ 2010-11-11 David Maus <dmaus@ictsoc.de> - * org-agenda.el (org-write-agenda): Delete postscript file after - creating conversion to pdf. + * org-agenda.el (org-write-agenda): Delete PostScript file after + creating conversion to PDF. 2010-11-11 David Maus <dmaus@ictsoc.de> @@ -10573,7 +10589,7 @@ a list of symbols specifying which of the special keywords #+DATE, #+AUTHOR, #+EMAIL and #+TITLE should be hidden by font lock. (org-fontify-meta-lines-and-blocks): Changes to font-lock code - implementing new faces and hiding behaviour. + implementing new faces and hiding behavior. * org-faces.el (org-document-title): New face for #+TITLE lines. (org-document-info): New face for #+DATE, #+AUTHOR, #+EMAIL lines. @@ -11436,7 +11452,7 @@ package. * org-latex.el (org-export-latex-tables): Only add a caption when - macro in in longtable environments if one has been defined. + macro is in longtable environments if one has been defined. * org-html.el (org-export-as-html): Only take title from buffer if not exporting body-only. @@ -13804,7 +13820,7 @@ 2009-08-06 Bastien Guerry <bzg@altern.org> - * org.el (org-special-ctrl-a/e): Explicitely bind the value + * org.el (org-special-ctrl-a/e): Explicitly bind the value 'reversed for this option to the "true line boundary first" behavior. (org-tags-match-list-sublevels): Document the 'indented value for @@ -15555,7 +15571,7 @@ * org.el (org-agenda-tags-todo-honor-ignore-options): Declare variable. - * org-table.el (org-table-insert-hline): Fix typo in fuction call + * org-table.el (org-table-insert-hline): Fix typo in function call to `backward-char'. * org-exp.el (org-export-as-html): Remove the initial space from @@ -16478,14 +16494,14 @@ 2008-11-23 Carsten Dominik <carsten.dominik@gmail.com> * org-export-latex.el (org-export-latex-subcontent): - Interprete target aliases as additonal labels. + Interpret target aliases as additional labels. * org-exp.el (org-export-target-aliases): New variable. (org-export-preprocess-string) (org-export-handle-invisible-targets): Fill the alias alist. (org-export-as-html): Remove the from the anchor, and also assign an id. - (org-html-level-start): Insert the target aliases as additonal + (org-html-level-start): Insert the target aliases as additional anchors. * org.el (org-edit-fixed-width-region): Fix bug when starting a new @@ -16833,7 +16849,7 @@ * org-agenda.el (org-format-agenda-item) (org-agenda-filter-make-matcher): Make sure tags are stored and - compared donwcased. + compared downcased. 2008-10-26 Carsten Dominik <dominik@science.uva.nl> @@ -17048,7 +17064,7 @@ * org.el (org-entry-get-multivalued-property) (org-entry-protect-space, org-entry-restore-space): New functions. - (org-file-apps-defaults-macosx): Let postscript files be opened by + (org-file-apps-defaults-macosx): Let PostScript files be opened by preview. (org-time-stamp-inactive): Call `org-time-stamp'. (org-time-stamp): New argument `inactive'. Also edit inacive @@ -17286,7 +17302,7 @@ (org-edit-fixed-width-region): Also try `org-edit-fixed-width-region'. (org-edit-fixed-width-region-mode): New option. - (org-activate-code): Only interprete lines starting with colon + (org-activate-code): Only interpret lines starting with colon plus a space as example lines. * org-remember.el (org-remember-templates): Add nil instead of @@ -18033,4 +18049,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/lisp/org/ob-haskell.el b/lisp/org/ob-haskell.el index cae07036c57..236dbba28f1 100644 --- a/lisp/org/ob-haskell.el +++ b/lisp/org/ob-haskell.el @@ -29,7 +29,7 @@ ;; they can be run, but haskell code can also be run through an ;; interactive interpreter. ;; -;; For now lets only allow evaluation using the haskell interpreter. +;; For now let's only allow evaluation using the haskell interpreter. ;;; Requirements: @@ -80,7 +80,7 @@ (cdr (member org-babel-haskell-eoe (reverse (mapcar #'org-babel-trim raw))))))) (org-babel-reassemble-table - (cond + (cond ((equal result-type 'output) (mapconcat #'identity (reverse (cdr results)) "\n")) ((equal result-type 'value) diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el index ee7a7cc212c..78d309b9e13 100644 --- a/lisp/org/ob-ocaml.el +++ b/lisp/org/ob-ocaml.el @@ -29,7 +29,7 @@ ;; they can be run, but ocaml code can also be run through an ;; interactive interpreter. ;; -;; For now lets only allow evaluation using the ocaml interpreter. +;; For now let's only allow evaluation using the ocaml interpreter. ;;; Requirements: @@ -99,7 +99,7 @@ (lambda (pair) (format "let %s = %s;;" (car pair) (org-babel-ocaml-elisp-to-ocaml (cdr pair)))) (mapcar #'cdr (org-babel-get-header params :var)))) - + (defun org-babel-ocaml-elisp-to-ocaml (val) "Return a string of ocaml code which evaluates to VAL." (if (listp val) diff --git a/lisp/org/ob-sql.el b/lisp/org/ob-sql.el index 9274438c18e..7a5c7c8a46a 100644 --- a/lisp/org/ob-sql.el +++ b/lisp/org/ob-sql.el @@ -32,7 +32,7 @@ ;; ;; Also SQL evaluation generally takes place inside of a database. ;; -;; For now lets just allow a generic ':cmdline' header argument. +;; For now let's just allow a generic ':cmdline' header argument. ;; ;; TODO: ;; @@ -40,7 +40,7 @@ ;; - add more useful header arguments (user, passwd, database, etc...) ;; - support for more engines (currently only supports mysql) ;; - what's a reasonable way to drop table data into SQL? -;; +;; ;;; Code: (require 'ob) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index aea284fe72c..f7aa7bf4701 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -156,7 +156,7 @@ and `org-agenda-entry-text-maxlines'." "Non-nil means export org-links as descriptive links in agenda added text. This variable applies to the text added to the agenda when `org-agenda-add-entry-text-maxlines' is larger than 0. -When this variable nil, the URL will (also) be shown." +When this variable is nil, the URL will (also) be shown." :group 'org-agenda :type 'boolean) @@ -339,7 +339,7 @@ agenda dispatcher \\[org-agenda]. Each entry is a list like this: key The key (one or more characters as a string) to be associated with the command. -desc A description of the command, when omitted or nil, a default +desc A description of the command; when omitted or nil, a default description is built using MATCH. type The command type, any of the following symbols: agenda The daily/weekly agenda. @@ -354,7 +354,7 @@ type The command type, any of the following symbols: match What to search for: - a single keyword for TODO keyword searches - a tags match expression for tags searches - - a word search expression for text searches. + - a word search expression for text searches - a regular expression for occur searches For all other commands, this should be the empty string. settings A list of option settings, similar to that in a let form, so like @@ -363,7 +363,7 @@ settings A list of option settings, similar to that in a let form, so like files A list of files file to write the produced agenda buffer to with the command `org-store-agenda-views'. If a file name ends in \".html\", an HTML version of the buffer - is written out. If it ends in \".ps\", a postscript version is + is written out. If it ends in \".ps\", a PostScript version is produced. Otherwise, only the plain text is written to the file. You can also define a set of commands, to create a composite agenda buffer. @@ -764,7 +764,7 @@ because you will take care of it on the day when scheduled." :group 'org-agenda-skip :group 'org-agenda-daily/weekly :type '(choice - (const :tag "Alwas show prewarning" nil) + (const :tag "Always show prewarning" nil) (const :tag "Remove prewarning if entry is scheduled" t) (integer :tag "Restart prewarning N days before deadline"))) @@ -1388,13 +1388,13 @@ When nil, such items are sorted as 0 minutes effort." (tags . " %i %-12:c") (search . " %i %-12:c")) "Format specifications for the prefix of items in the agenda views. -An alist with five entries, each for the different agenda types. The -keys of the sublists are `agenda', `timeline', `todo', `search' and `tags'. +An alist with five entries, each for the different agenda types. The +keys of the sublists are `agenda', `timeline', `todo', `search' and `tags'. The values are format strings. This format works similar to a printf format, with the following meaning: - %c the category of the item, \"Diary\" for entries from the diary, + %c the category of the item, \"Diary\" for entries from the diary, or as given by the CATEGORY keyword or derived from the file name %i the icon category of the item, see `org-agenda-category-icon-alist' %T the last tag of the item (ignore inherited tags, which come first) @@ -1408,10 +1408,10 @@ contain two additional characters: a question mark just after the `%' and a whitespace/punctuation character just before the final letter. If the first character after `%' is a question mark, the entire field -will only be included if the corresponding value applies to the current -entry. This is useful for fields which should have fixed width when -present, but zero width when absent. For example, \"%?-12t\" will -result in a 12 character time field if a time of the day is specified, +will only be included if the corresponding value applies to the current +entry. This is useful for fields which should have fixed width when +present, but zero width when absent. For example, \"%?-12t\" will +result in a 12 character time field if a time of the day is specified, but will completely disappear in entries which do not contain a time. If there is punctuation or whitespace character just before the final @@ -1420,7 +1420,7 @@ the value is not empty. For example, the format \"%-12:c\" leads to \"Diary: \" if the category is \"Diary\". If the category were be empty, no additional colon would be inserted. -The default value for the agenda sublist is \" %-12:c%?-12t% s\", +The default value for the agenda sublist is \" %-12:c%?-12t% s\", which means: - Indent the line with two space characters @@ -1697,7 +1697,7 @@ For example, this value makes those two functions available: (?C bulk-cut)) With selected entries in an agenda buffer, `B R' will call -the custom function `set-category' on the selected entries. +the custom function `set-category' on the selected entries. Note that functions in this alist don't need to be quoted." :type 'alist :group 'org-agenda) @@ -2744,8 +2744,8 @@ This ensures the export commands can easily use it." (defun org-write-agenda (file &optional open nosettings) "Write the current buffer (an agenda view) as a file. Depending on the extension of the file name, plain text (.txt), -HTML (.html or .htm) or Postscript (.ps) is produced. -If the extension is .ics, run icalendar export over all files used +HTML (.html or .htm) or PostScript (.ps) is produced. +If the extension is .ics, run iCalendar export over all files used to construct the agenda and limit the export to entries listed in the agenda now. With prefix argument OPEN, open the new file immediately. @@ -2793,7 +2793,7 @@ higher priority settings." ((string-match "\\.ps\\'" file) (require 'ps-print) (ps-print-buffer-with-faces file) - (message "Postscript written to %s" file)) + (message "PostScript written to %s" file)) ((string-match "\\.pdf\\'" file) (require 'ps-print) (ps-print-buffer-with-faces @@ -2972,7 +2972,7 @@ removed from the entry content. Currently only `planning' is allowed here." (nreverse markers))) (defun org-create-marker-find-array (marker-list) - "Create a alist of files names with all marker positions in that file." + "Create an alist of files names with all marker positions in that file." (let (f tbl m a p) (while (setq m (pop marker-list)) (setq p (marker-position m) @@ -2997,7 +2997,7 @@ removed from the entry content. Currently only `planning' is allowed here." (member (point) (cdr a))))))) (defun org-check-for-org-mode () - "Make sure current buffer is in org-mode. Error if not." + "Make sure current buffer is in Org-mode. Error if not." (or (org-mode-p) (error "Cannot execute org-mode agenda command on buffer in %s" major-mode))) @@ -3715,9 +3715,9 @@ given in `org-agenda-start-on-weekday'." (defvar org-todo-only nil) (defvar org-search-syntax-table nil - "Special syntax table for org-mode search. -In this table, we have single quotes not as word constituents, to -that when \"+Ameli\" is searched as a work, it will also match \"Ameli's\"") + "Special syntax table for Org-mode search. +In this table, we have single quotes not as word constituents, so +that when \"+Ameli\" is searched as a word, it will also match \"Ameli's\"") (defun org-search-syntax-table () (unless org-search-syntax-table @@ -4425,7 +4425,7 @@ date. It also removes lines that contain only whitespace." (setq string (org-modify-diary-entry-string string)))))) (defun org-modify-diary-entry-string (string) - "Add text properties to string, allowing org-mode to act on it." + "Add text properties to string, allowing Org-mode to act on it." (org-add-props string nil 'mouse-face 'highlight 'help-echo (if buffer-file-name @@ -5003,9 +5003,9 @@ See also the user option `org-agenda-clock-consistency-checks'." "\\(-\\{1,3\\}\\(\\[.*?\\]\\)\\)?")) ; group 3 is second (tlstart 0.) (tlend 0.) - (maxtime (org-hh:mm-string-to-minutes + (maxtime (org-hh:mm-string-to-minutes (or (plist-get pl :max-duration) "24:00"))) - (mintime (org-hh:mm-string-to-minutes + (mintime (org-hh:mm-string-to-minutes (or (plist-get pl :min-duration) 0))) (maxgap (org-hh:mm-string-to-minutes ;; default 30:00 means never complain @@ -5059,7 +5059,7 @@ See also the user option `org-agenda-clock-consistency-checks'." (/ (- tlend ts) 60)) face (or (plist-get pl :overlap-face) face))) ((and (> tlend 0) (> ts (+ tlend (* 60 maxgap)))) - ;; There is a gap, lets see if we need to report it + ;; There is a gap, let's see if we need to report it (unless (org-agenda-check-clock-gap tlend ts gapok) (setq issue (format "Clocking gap: %d minutes" (/ (- ts tlend) 60)) diff --git a/lisp/org/org-bbdb.el b/lisp/org/org-bbdb.el index a7b6efae836..8401196c81a 100644 --- a/lisp/org/org-bbdb.el +++ b/lisp/org/org-bbdb.el @@ -357,7 +357,7 @@ This is used by Org to re-create the anniversary hash table." (bbdb-record-name (car (bbdb-completing-read-record "Name: "))))) (defun org-bbdb-anniv-export-ical () - "Extract anniversaries from BBDB and convert them to icalendar format." + "Extract anniversaries from BBDB and convert them to iCalendar format." (require 'bbdb) (require 'diary-lib) (unless (hash-table-p org-bbdb-anniv-hash) diff --git a/lisp/org/org-beamer.el b/lisp/org/org-beamer.el index 5cebe50efd1..d5f9beea337 100644 --- a/lisp/org/org-beamer.el +++ b/lisp/org/org-beamer.el @@ -411,7 +411,7 @@ the value will be inserted right after the documentclass statement." ;; Functions to initialize and post-process -;; These fuctions will be hooked into various places in the export process +;; These functions will be hooked into various places in the export process (defun org-beamer-initialize-open-trackers () "Reset variables that track if certain environments are open during export." @@ -451,7 +451,7 @@ The effect is that these values will be accessible during export." ((stringp org-beamer-frame-level-now) (setq org-beamer-frame-level-now (string-to-number org-beamer-frame-level-now)))) - ;; Find the header additons, most likely theme commands + ;; Find the header additions, most likely theme commands (setq org-beamer-header-extra (or (and (org-region-active-p) (save-excursion diff --git a/lisp/org/org-bibtex.el b/lisp/org/org-bibtex.el index 5c9b37b2341..138d99a36d9 100644 --- a/lisp/org/org-bibtex.el +++ b/lisp/org/org-bibtex.el @@ -204,7 +204,7 @@ (:pages . "One or more page numbers or range of numbers, such as 42-111 or 7,41,73-97 or 43+ (the ‘+’ in this last example indicates pages following that don’t form simple range). BibTEX requires double dashes for page ranges (--).") (:publisher . "The publisher’s name.") (:school . "The name of the school where a thesis was written.") - (:series . "The name of a series or set of books. When citing an entire book, the the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") + (:series . "The name of a series or set of books. When citing an entire book, the title field gives its title and an optional series field gives the name of a series or multi-volume set in which the book is published.") (:title . "The work’s title, typed as explained in the LaTeX book.") (:type . "The type of a technical report for example, 'Research Note'.") (:volume . "The volume of a journal or multi-volume book.") @@ -221,7 +221,7 @@ (defcustom org-bibtex-prefix nil "Optional prefix for all bibtex property names. -For example setting to 'BIB_' would allow interoperability with fireforg." +For example setting to 'BIB_' would allow interoperability with Fireforg." :group 'org-bibtex :type 'string) diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el index de5087e163c..6279ed3df0d 100644 --- a/lisp/org/org-clock.el +++ b/lisp/org/org-clock.el @@ -1261,7 +1261,7 @@ line and position cursor in that line." (and (re-search-forward org-property-end-re nil t) (goto-char (match-beginning 0)))) (throw 'exit t)) - ;; Lets count the CLOCK lines + ;; Let's count the CLOCK lines (goto-char beg) (while (re-search-forward re end t) (setq first (or first (match-beginning 0)) @@ -2125,7 +2125,7 @@ the currently selected interval size." "Write out a clock table at position IPOS in the current buffer. TABLES is a list of tables with clocking data as produced by `org-clock-get-table-data'. PARAMS is the parameter property list obtained -from the dynamic block defintion." +from the dynamic block definition." ;; This function looks quite complicated, mainly because there are a ;; lot of options which can add or remove columns. I have massively ;; commented this function, the I hope it is understandable. If @@ -2641,4 +2641,3 @@ The details of what will be saved are regulated by the variable ;;; org-clock.el ends here - diff --git a/lisp/org/org-compat.el b/lisp/org/org-compat.el index 896acc5aeae..5e4935caa7e 100644 --- a/lisp/org/org-compat.el +++ b/lisp/org/org-compat.el @@ -272,7 +272,7 @@ Works on both Emacs and XEmacs." nil)) (defmacro org-xemacs-without-invisibility (&rest body) - "Turn off exents with invisibility while executing BODY." + "Turn off extents with invisibility while executing BODY." `(let ((ext-inv (extent-list nil (point-at-bol) (point-at-eol) 'all-extents-closed-open 'invisible)) ext-inv-specs) diff --git a/lisp/org/org-ctags.el b/lisp/org/org-ctags.el index 48eced9ea08..352d414a4b6 100644 --- a/lisp/org/org-ctags.el +++ b/lisp/org/org-ctags.el @@ -64,19 +64,19 @@ ;; with the same name as the link; then, if unsuccessful, ask the user if ;; he/she wants to rebuild the 'TAGS' database and try again; then ask if ;; the user wishes to append 'tag' as a new toplevel heading at the end of -;; the buffer; and finally, defer to org's default behaviour which is to +;; the buffer; and finally, defer to org's default behavior which is to ;; search the entire text of the current buffer for 'tag'. ;; -;; This behaviour can be modified by changing the value of +;; This behavior can be modified by changing the value of ;; ORG-CTAGS-OPEN-LINK-FUNCTIONS. For example I have the following in my -;; .emacs, which describes the same behaviour as the above paragraph with +;; .emacs, which describes the same behavior as the above paragraph with ;; one difference: ;; ;; (setq org-ctags-open-link-functions ;; '(org-ctags-find-tag ;; org-ctags-ask-rebuild-tags-file-then-find-tag ;; org-ctags-ask-append-topic -;; org-ctags-fail-silently)) ; <-- prevents org default behaviour +;; org-ctags-fail-silently)) ; <-- prevents org default behavior ;; ;; ;; Usage diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el index 223d2573fdb..0d47132d2f8 100644 --- a/lisp/org/org-footnote.el +++ b/lisp/org/org-footnote.el @@ -574,7 +574,7 @@ normalized footnotes towards the end of the pre-processing buffer. Some exporters like docbook, odt, etc. expect that footnote definitions be available before any references to them. Such exporters can let bind `org-footnote-insert-pos-for-preprocessor' to -symbol 'point-min to achieve the desired behaviour. +symbol 'point-min to achieve the desired behavior. Additional note on `org-footnote-insert-pos-for-preprocessor': 1. This variable has not effect when FOR-PREPROCESSOR is nil. diff --git a/lisp/org/org-icalendar.el b/lisp/org/org-icalendar.el index dd64fc2f783..8a2d66306f3 100644 --- a/lisp/org/org-icalendar.el +++ b/lisp/org/org-icalendar.el @@ -204,7 +204,7 @@ When nil of the empty string, use the abbreviation retrieved from Emacs." (if org-icalendar-use-UTC-date-time ":%Y%m%dT%H%M%SZ" ":%Y%m%dT%H%M%S") - "Format-string for exporting icalendar DATE-TIME. + "Format-string for exporting iCalendar DATE-TIME. See `format-time-string' for a full documentation. The only difference is that `org-icalendar-timezone' is used for %Z. diff --git a/lisp/org/org-latex.el b/lisp/org/org-latex.el index 0402b2da964..7abf85a7092 100644 --- a/lisp/org/org-latex.el +++ b/lisp/org/org-latex.el @@ -304,8 +304,8 @@ markup defined, the first one in the association list will be used." (defcustom org-export-latex-href-format "\\href{%s}{%s}" "A printf format string to be applied to href links. -The format must contain either two %s instances or just one. -If it contains two %s instances, the first will be filled with +The format must contain either two %s instances or just one. +If it contains two %s instances, the first will be filled with the link, the second with the link description. If it contains only one, the %s will be filled with the link." :group 'org-export-latex @@ -594,7 +594,7 @@ and `org-export-with-tags' instead." "Extensions of image files that can be inlined into LaTeX. Note that the image extension *actually* allowed depend on the way the LaTeX file is processed. When used with pdflatex, pdf, jpg and png images -are OK. When processing through dvi to Postscript, only ps and eps are +are OK. When processing through dvi to PostScript, only ps and eps are allowed. The default we use here encompasses both." :group 'org-export-latex :type '(repeat (string :tag "Extension"))) @@ -2203,7 +2203,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER." ;; a LaTeX issue, but we here implement a work-around anyway. (setq path (org-export-latex-protect-amp path) desc (org-export-latex-protect-amp desc))) - (insert + (insert (if (string-match "%s.*%s" org-export-latex-href-format) (format org-export-latex-href-format path desc) (format org-export-latex-href-format path)))) diff --git a/lisp/org/org-list.el b/lisp/org/org-list.el index d3c5dd99aa6..9184f0c3d54 100644 --- a/lisp/org/org-list.el +++ b/lisp/org/org-list.el @@ -70,12 +70,12 @@ ;; (a few thousand lines long). Thus, code should follow the rule : ;; "collect once, use many". As a corollary, it is usally a bad idea ;; to use directly an interactive function inside the code, as those, -;; being independant entities, read the whole list structure another +;; being independent entities, read the whole list structure another ;; time. ;;; Code: -(eval-when-compile +(eval-when-compile (require 'cl)) (require 'org-macs) (require 'org-compat) @@ -681,7 +681,7 @@ Assume point is at an item." (cond ((<= (point) lim-up) ;; At upward limit: if we ended at an item, store it, - ;; else dimiss useless data recorded above BEG-CELL. + ;; else dismiss useless data recorded above BEG-CELL. ;; Jump to part 2. (throw 'exit (setq itm-lst @@ -1177,7 +1177,7 @@ some heuristics to guess the result." ;; When `org-blank-before-new-entry' says so, it is 1. ((eq insert-blank-p t) 1) ;; `plain-list-item' is 'auto. Count blank lines separating - ;; neighbours items in list. + ;; neighboring items in list. (t (let ((next-p (org-list-get-next-item item struct prevs))) (cond ;; Is there a next item? @@ -1207,7 +1207,7 @@ some heuristics to guess the result." If POS is before first character after bullet of the item, the new item will be created before the current one. -STRUCT is the list structure. PREVS is the the alist of previous +STRUCT is the list structure. PREVS is the alist of previous items, as returned by `org-list-prevs-alist'. Insert a checkbox if CHECKBOX is non-nil, and string AFTER-BULLET @@ -2642,7 +2642,7 @@ If a region is active, all items inside will be moved." (defvar org-tab-ind-state) (defun org-cycle-item-indentation () "Cycle levels of indentation of an empty item. -The first run indents the item, if applicable. Subsequents runs +The first run indents the item, if applicable. Subsequent runs outdent it at meaningful levels in the list. When done, item is put back at its original position with its original bullet. diff --git a/lisp/org/org-plot.el b/lisp/org/org-plot.el index b90c248eb6d..419467226c9 100644 --- a/lisp/org/org-plot.el +++ b/lisp/org/org-plot.el @@ -136,7 +136,7 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE." "Export the data in TABLE to DATA-FILE for gnuplot. This means in a format appropriate for grid plotting by gnuplot. PARAMS specifies which columns of TABLE should be plotted as independent -and dependant variables." +and dependent variables." (interactive) (let* ((ind (- (plist-get params :ind) 1)) (deps (if (plist-member params :deps) diff --git a/lisp/org/org-publish.el b/lisp/org/org-publish.el index ddb3cf7b63a..0c924cd9f07 100644 --- a/lisp/org/org-publish.el +++ b/lisp/org/org-publish.el @@ -191,7 +191,7 @@ sitemap of files or summary page for a given project. display folders first or last, respectively. Any other value will mix files and folders. :sitemap-sort-files The site map is normally sorted alphabetically. - You can change this behaviour setting this to + You can change this behavior setting this to `chronologically', `anti-chronologically' or nil. :sitemap-ignore-case Should sorting be case-sensitive? Default nil. @@ -1114,7 +1114,7 @@ so that the file including them will be republished as well." (let ((ctime (org-publish-cache-ctime-of-src filename))) (or (< pstamp ctime) (when included-files-ctime - (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) + (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) included-files-ctime)))))))))) (defun org-publish-cache-set-file-property (filename property value &optional project-name) diff --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el index 2bc5ef92ae7..8819f416f1d 100644 --- a/lisp/org/org-remember.el +++ b/lisp/org/org-remember.el @@ -63,7 +63,7 @@ and `org-remember-default-headline'. To force prompting anyway, use \\[universal-argument] \\[org-remember-finalize] to file the note. When this variable is nil, \\[org-remember-finalize] gives you the prompts, and -\\[universal-argument] \\[org-remember-finalize] triggers the fasttrack." +\\[universal-argument] \\[org-remember-finalize] triggers the fast track." :group 'org-remember :type 'boolean) @@ -1122,7 +1122,7 @@ See also the variable `org-reverse-note-order'." (condition-case nil (require 'remember) (error - ;; Lets install our own micro version of remember + ;; Let's install our own micro version of remember (defvar remember-register ?R) (defvar remember-mode-hook nil) (defvar remember-handler-functions nil) @@ -1153,4 +1153,3 @@ See also the variable `org-reverse-note-order'." ;;; org-remember.el ends here - diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 7f49b3236ee..2fba931528e 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el @@ -2204,7 +2204,7 @@ For all numbers larger than LIMIT, shift them by DELTA." (string-match "^[a-zA-Z][a-zA-Z0-9]*$" field)) (push (cons field v) org-table-local-parameters) (push (list field line col) org-table-named-field-locations)))) - ;; Analyse the line types + ;; Analyze the line types (goto-char beg) (setq org-table-current-begin-line (org-current-line) org-table-current-begin-pos (point) @@ -2432,7 +2432,7 @@ not overwrite the stored one." duration-output-format nil fmt (replace-match "" t t fmt))) (if (string-match "t" fmt) - (setq duration t + (setq duration t duration-output-format org-table-duration-custom-format numbers t fmt (replace-match "" t t fmt))) @@ -2500,7 +2500,7 @@ not overwrite the stored one." ;; Insert complex ranges (while (and (string-match org-table-range-regexp form) (> (length (match-string 0 form)) 1)) - (setq formrg (save-match-data + (setq formrg (save-match-data (org-table-get-range (match-string 0 form) nil n0))) (setq formrpl (save-match-data @@ -4723,4 +4723,3 @@ list of the fields in the rectangle ." ;;; org-table.el ends here - diff --git a/lisp/org/org-taskjuggler.el b/lisp/org/org-taskjuggler.el index 0d9516a389e..1fb3114bf3f 100644 --- a/lisp/org/org-taskjuggler.el +++ b/lisp/org/org-taskjuggler.el @@ -70,7 +70,7 @@ ;; "taskjuggler_project" (or whatever you customized ;; `org-export-taskjuggler-project-tag' to). You are now ready to ;; export the project plan with `org-export-as-taskjuggler-and-open' -;; which will export the project plan and open a gant chart in +;; which will export the project plan and open a Gantt chart in ;; TaskJugglerUI. ;; ;; * Resources @@ -354,8 +354,8 @@ information, all the properties, etc." (let* ((props (org-entry-properties)) (components (org-heading-components)) (level (nth 1 components)) - (headline - (replace-regexp-in-string + (headline + (replace-regexp-in-string "\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines (parent-ordered (org-taskjuggler-parent-is-ordered-p))) (push (cons "level" level) props) @@ -405,10 +405,10 @@ deeper), then it's not a leaf." (successor (car (cdr tasks)))) (cond ;; if a task has no successors it is a leaf - ((null successor) + ((null successor) (push (cons (cons "leaf-node" t) task) new-list)) ;; if the successor has a lower level than task it is a leaf - ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task))) + ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task))) (push (cons (cons "leaf-node" t) task) new-list)) ;; otherwise examine the rest of the tasks (t (push task new-list)))) diff --git a/lisp/org/org.el b/lisp/org/org.el index da39aa189ba..25bfb8a78e8 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -1480,9 +1480,9 @@ When nil, the link search tries to match a phrase with all words in the search text." :group 'org-link-follow :type '(choice - (const :tag "Use fuzy text search" nil) + (const :tag "Use fuzzy text search" nil) (const :tag "Match only exact headline" t) - (const :tag "Match extact headline or query to create it" + (const :tag "Match exact headline or query to create it" query-to-create))) (defcustom org-link-frame-setup @@ -2681,7 +2681,7 @@ When this variable is set to t, the date/time prompt will not let you specify dates outside the 1970-2037 range, so it is certain that these dates will work in whatever version of Emacs you are running, and also that you can move a file from one Emacs implementation -to another. WHenever Org is forcing the year for you, it will display +to another. Whenever Org is forcing the year for you, it will display a message and beep. When this variable is nil, Org will check if the date is @@ -2924,7 +2924,7 @@ is better to limit inheritance to certain tags using the variables (const :tag "List them, indented with leading dots" indented))) (defcustom org-tags-sort-function nil - "When set, tags are sorted using this function as a comparator." + "When set, tags are sorted using this comparison function." :group 'org-tags :type '(choice (const :tag "No sorting" nil) @@ -5052,7 +5052,7 @@ The time stamps may be either active or inactive.") (defvar org-emph-face nil) (defun org-do-emphasis-faces (limit) - "Run through the buffer and add overlays to emphasised strings." + "Run through the buffer and add overlays to emphasized strings." (let (rtn a) (while (and (not rtn) (re-search-forward org-emph-re limit t)) (if (not (= (char-after (match-beginning 3)) @@ -5549,7 +5549,7 @@ Use `org-reduced-level' to remove the effect of `org-odd-levels'." (defvar org-font-lock-set-keywords-hook nil "Functions that can manipulate `org-font-lock-extra-keywords'. -This is calles after `org-font-lock-extra-keywords' is defined, but before +This is called after `org-font-lock-extra-keywords' is defined, but before it is installed to be used by font lock. This can be useful if something needs to be inserted at a specific position in the font-lock sequence.") @@ -11217,7 +11217,7 @@ changes. Such blocking occurs when: (forward-line 1) (re-search-forward org-not-done-heading-regexp pos t)) (throw 'dont-block nil)) ; block, there is an older sibling not done. - ;; Search further up the hierarchy, to see if an anchestor is blocked + ;; Search further up the hierarchy, to see if an ancestor is blocked (while t (goto-char parent-pos) (if (not (looking-at org-not-done-heading-regexp)) @@ -14835,7 +14835,7 @@ user." (setq ans (replace-match (format "%04d-%02d-%02d\\5" year month day) t nil ans))) - ;; Help matching dottet european dates + ;; Help matching dotted european dates (when (string-match "^ *\\(3[01]\\|0?[1-9]\\|[12][0-9]\\)\\. ?\\(0?[1-9]\\|1[012]\\)\\. ?\\([1-9][0-9][0-9][0-9]\\)?" ans) (setq year (if (match-end 3) diff --git a/lisp/outline.el b/lisp/outline.el index 34d30fc4591..b5bf8296455 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -144,10 +144,10 @@ in the file it applies to." :help "Promote headings higher up the tree")) (define-key map [headings move-subtree-down] '(menu-item "Move Subtree Down" outline-move-subtree-down - :help "Move the currrent subtree down past arg headlines of the same level")) + :help "Move the current subtree down past arg headlines of the same level")) (define-key map [headings move-subtree-up] '(menu-item "Move Subtree Up" outline-move-subtree-up - :help "Move the currrent subtree up past arg headlines of the same level")) + :help "Move the current subtree up past arg headlines of the same level")) (define-key map [headings copy] '(menu-item "Copy to Kill Ring" outline-headers-as-kill :enable mark-active @@ -642,12 +642,12 @@ the match data is set appropriately." ;; Vertical tree motion (defun outline-move-subtree-up (&optional arg) - "Move the currrent subtree up past ARG headlines of the same level." + "Move the current subtree up past ARG headlines of the same level." (interactive "p") (outline-move-subtree-down (- arg))) (defun outline-move-subtree-down (&optional arg) - "Move the currrent subtree down past ARG headlines of the same level." + "Move the current subtree down past ARG headlines of the same level." (interactive "p") (let ((movfunc (if (> arg 0) 'outline-get-next-sibling 'outline-get-last-sibling)) diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el index 86e6b4abb6c..a7a332d97f2 100644 --- a/lisp/play/5x5.el +++ b/lisp/play/5x5.el @@ -151,7 +151,7 @@ "Local keymap for the 5x5 game.") (5x5-defvar-local 5x5-solver-output nil - "List that is is the output of artihmetic solver. + "List that is the output of an arithmetic solver. This list L is such that @@ -162,8 +162,8 @@ M is the move count when the solve output was stored. S_1 ... S_N are all the solutions ordered from least to greatest number of strokes. S_1 is the solution to be displayed. -Each solution S_1, ..., S_N is a a list (STROKE-COUNT GRID) where -STROKE-COUNT is to number of strokes to achieve the solution and +Each solution S_1, ..., S_N is a list (STROKE-COUNT GRID) where +STROKE-COUNT is the number of strokes to achieve the solution and GRID is the grid of positions to click.") @@ -816,9 +816,8 @@ solution that is presented is the one that needs least number of strokes --- other solutions can be viewed by rotating through the list. The list of solution is ordered by number of strokes, so rotating left just after calling `5x5-solve-suggest' will show -the the solution with second least number of strokes, while -rotating right will show the solution with greatest number of -strokes." +the solution with second least number of strokes, while rotating +right will show the solution with greatest number of strokes." (interactive "P") (let ((len (length 5x5-solver-output))) (when (>= len 3) diff --git a/lisp/play/animate.el b/lisp/play/animate.el index facdfa2f347..ec0cacc4a68 100644 --- a/lisp/play/animate.el +++ b/lisp/play/animate.el @@ -93,7 +93,7 @@ (defvar animation-buffer-name nil "*String naming the default buffer for animations. -When nil animations dipslayed in the buffer named *Animation*.") +When nil animations displayed in the buffer named *Animation*.") ;;;###autoload (defun animate-string (string vpos &optional hpos) diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el index 168d528ecb1..a41d5a3d3d1 100644 --- a/lisp/play/bruce.el +++ b/lisp/play/bruce.el @@ -110,7 +110,7 @@ :group 'games) (defcustom bruce-phrases-file "~/bruce.lines" - "Keep your favourite phrases here." + "Keep your favorite phrases here." :type 'file :group 'bruce) diff --git a/lisp/play/bubbles.el b/lisp/play/bubbles.el index f2b7294e2d0..62d486ffca5 100644 --- a/lisp/play/bubbles.el +++ b/lisp/play/bubbles.el @@ -55,7 +55,7 @@ ;; 0.3 (2007-03-11) ;; - Renamed shift modes and thus names of score files. All -;; highscores are lost, unless you rename the score files from +;; high scores are lost, unless you rename the score files from ;; bubbles-shift-... to bubbles-...! ;; - Bugfixes: Check for successful image creation. ;; Disable menus and counter when game is over. diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el index b9ce669533a..4d4ea71cd7a 100644 --- a/lisp/play/decipher.el +++ b/lisp/play/decipher.el @@ -672,7 +672,7 @@ X: A B C D E F G H I J K L M N O P Q R S T U V W X Y Z * 11 14 9% 1 1 1 2 1 1 2 5 7 This says that X comes before D once, and after B once. X begins 5 words, and ends 3 words (`*' represents a space). X comes before 8 -different letters, after 7 differerent letters, and is next to a total +different letters, after 7 different letters, and is next to a total of 11 different letters. It occurs 14 times, making up 9% of the ciphertext." (interactive (list (upcase (following-char)))) diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el index 55b0a564fef..a46c2ba8171 100644 --- a/lisp/play/fortune.el +++ b/lisp/play/fortune.el @@ -52,7 +52,7 @@ ;; (lambda () ;; (define-key gnus-article-mode-map "i" 'fortune-from-region))) ;; which allows marking a region and then pressing "i" so that the marked -;; region will be automatically added to my favourite fortune-file. +;; region will be automatically added to my favorite fortune-file. ;;; Code: diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el index f0e6670fe58..8629baf35d3 100644 --- a/lisp/play/landmark.el +++ b/lisp/play/landmark.el @@ -1584,7 +1584,7 @@ If the game is finished, this command requests for another game." ;;;_ - something which doesn't work ; no-a-worka!! -;(defum landmark-sum-list (list) +;(defun landmark-sum-list (list) ; (if (> (length list) 0) ; (+ (car list) (landmark-sum-list (cdr list))) ; 0)) diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el index 722c3b43033..b52ade6fdb7 100644 --- a/lisp/play/solitaire.el +++ b/lisp/play/solitaire.el @@ -190,7 +190,7 @@ That's all. Here's the board after two moves: o o o -Pick your favourite shortcuts: +Pick your favorite shortcuts: \\{solitaire-mode-map}" diff --git a/lisp/printing.el b/lisp/printing.el index 9f98c2b6e29..c5951a4983f 100644 --- a/lisp/printing.el +++ b/lisp/printing.el @@ -4667,7 +4667,7 @@ bottom." "Interactively select a PostScript utility." (interactive) (pr-menu-set-utility-title - (pr-complete-alist "Postscript utility" + (pr-complete-alist "PostScript utility" pr-ps-utility-alist pr-ps-utility))) diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el index 89a37307506..9d2aad7741b 100644 --- a/lisp/progmodes/ada-mode.el +++ b/lisp/progmodes/ada-mode.el @@ -105,8 +105,8 @@ ;; should be loaded before the ada-mode, which will then setup some variables ;; to improve the support for Ada code. ;; Here is the list of these modes: -;; `which-function-mode': Display the name of the subprogram the cursor is -;; in in the mode line. +;; `which-function-mode': Display in the modeline the name of the subprogram +;; the cursor is in. ;; `outline-mode': Provides the capability to collapse or expand the code ;; for specific language constructs, for instance if you want to hide the ;; code corresponding to a subprogram diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el index 4a57a1eef67..0cfdab23702 100644 --- a/lisp/progmodes/ada-xref.el +++ b/lisp/progmodes/ada-xref.el @@ -1163,7 +1163,8 @@ If OTHER-FRAME is non-nil, display the cross-reference in another frame." (defun ada-goto-declaration-other-frame (pos) "Display the declaration of the identifier around POS. -The declation is shown in another frame if `ada-xref-other-buffer' is non-nil." +The declaration is shown in another frame if `ada-xref-other-buffer' is +non-nil." (interactive "d") (ada-goto-declaration pos t)) @@ -1747,7 +1748,7 @@ Information is extracted from the ali file." (unless declaration-found - ;; Since we alread know the number of the file, search for a direct + ;; Since we already know the number of the file, search for a direct ;; reference to it (goto-char (point-min)) (set 'declaration-found t) diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el index 3aa9a6cfb87..fce725c3b3c 100644 --- a/lisp/progmodes/autoconf.el +++ b/lisp/progmodes/autoconf.el @@ -83,7 +83,8 @@ searching backwards at another AC_... command." (set (make-local-variable 'defun-prompt-regexp) "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+") (set (make-local-variable 'comment-start) "dnl ") - (set (make-local-variable 'comment-start-skip) "\\(?:\\<dnl\\|#\\) +") + (set (make-local-variable 'comment-start-skip) + "\\(?:\\(\\W\\|\\`\\)dnl\\|#\\) +") (set (make-local-variable 'syntax-propertize-function) (syntax-propertize-rules ("\\<dnl\\>" (0 "<")))) (set (make-local-variable 'font-lock-defaults) diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index d19ba47aa3f..aa1289cd632 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -71,7 +71,7 @@ ;; / can delimit regexes or be a division operator. By default we assume ;; that it is a division sign, and fix the regexp operator cases with ;; `font-lock-syntactic-keywords'. - (modify-syntax-entry ?/ "." st) ; ACM 2002/4/27. + (modify-syntax-entry ?/ "." st) ; ACM 2002/4/27. (modify-syntax-entry ?* "." st) (modify-syntax-entry ?+ "." st) (modify-syntax-entry ?- "." st) @@ -195,7 +195,7 @@ ;; Matches the inside of an AWK regexp (i.e. without the enclosing /s) (defconst c-awk-regexp-without-end-re (concat "/" c-awk-regexp-innards-re)) -;; Matches an AWK regexp up to, but not including, any terminating /. +;; Matches an AWK regexp up to, but not including, any terminating /. (defconst c-awk-one-line-possibly-open-regexp-re (concat "/\\(" c-awk-non-eol-esc-pair-re "\\|" c-awk-regexp-one-line-possibly-open-char-list-re @@ -256,7 +256,7 @@ ;; ACM, 2002/5/29: -;; +;; ;; The next section of code is about determining whether or not an AWK ;; statement is complete or not. We use this to indent the following line. ;; The determination is pretty straightforward in C, where a statement ends @@ -382,7 +382,7 @@ ;; Kludge: If c-backward-syntactic-ws gets stuck at a BOL, it is likely ;; that the previous line contains an unterminated string (without \). In ;; this case, assume that the previous line's c-awk-NL-prop is a $. - ;; + ;; ;; POINT MUST BE AT THE START OF A LINE when calling this function. This ;; is to ensure that the various backward-comment functions will work ;; properly. @@ -425,13 +425,13 @@ ;; Calculate and set the value of the c-awk-NL-prop on the immediately ;; preceding EOL. This may also involve doing the same for several ;; preceding EOLs. - ;; + ;; ;; NOTE that if the property was already set, we return it without ;; recalculation. (This is by accident rather than design.) - ;; + ;; ;; Return the property which got set (or was already set) on the previous ;; line. Return nil if we hit BOB. - ;; + ;; ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. ;; ;; This function might do hidden buffer changes. @@ -492,7 +492,7 @@ ;; if necessary. (As a special case, the property doesn't get set on an ;; empty line at EOB (there's no position to set the property on), but the ;; function returns the property value an EOL would have got.) - ;; + ;; ;; See c-awk-after-if-for-while-condition-p for a description of DO-LIM. ;; ;; This function might do hidden buffer changes. @@ -566,7 +566,7 @@ ;; this, a new newline inserted after an old newline (e.g. by C-j) would ;; inherit any c-awk-NL-prop from the old newline. This would be a Bad ;; Thing. This function's action is required by c-put-char-property. - (if (and (boundp 'text-property-default-nonsticky) ; doesn't exist in Xemacs + (if (and (boundp 'text-property-default-nonsticky) ; doesn't exist in XEmacs (not (assoc 'c-awk-NL-prop text-property-default-nonsticky))) (setq text-property-default-nonsticky (cons '(c-awk-NL-prop . t) text-property-default-nonsticky)))) @@ -611,7 +611,7 @@ ;; Go back to the start of the (apparent) current line (or the start of the ;; line containing POS), returning the buffer position of that point. I.e., ;; go back to the last line which doesn't have an escaped EOL before it. -;; +;; ;; This is guaranteed to be "safe" for syntactic analysis, i.e. outwith any ;; comment, string or regexp. IT MAY WELL BE that this function should not be ;; executed on a narrowed buffer. @@ -718,7 +718,7 @@ ;; This function does hidden buffer changes. (let ((/point (point))) (goto-char anchor) - ;; Analyse the line to find out what the / is. + ;; Analyze the line to find out what the / is. (if (if anchor-state-/div (not (search-forward-regexp c-awk-regexp-sign-re (1+ /point) t)) (search-forward-regexp c-awk-div-sign-re (1+ /point) t)) @@ -776,7 +776,7 @@ (setq anchor (point)) (search-forward-regexp c-awk-harmless-string*-here-re nil t) ;; We are now looking at either a " or a /. - ;; Do our thing on the string, regexp or divsion sign. + ;; Do our thing on the string, regexp or division sign. (setq anchor-state-/div (if (looking-at "_?\"") (c-awk-syntax-tablify-string) @@ -823,14 +823,14 @@ ;; Don't overlook the possibility of the buffer change being the "recapturing" ;; of a previously escaped newline. -;; ACM 2008-02-05: +;; ACM 2008-02-05: (defun c-awk-extend-and-syntax-tablify-region (beg end old-len) ;; Expand the region (BEG END) as needed to (c-new-BEG c-new-END) then put ;; `syntax-table' properties on this region. ;; ;; This function is called from an after-change function, BEG END and ;; OLD-LEN being the standard parameters. - ;; + ;; ;; Point is undefined both before and after this function call, the buffer ;; has been widened, and match-data saved. The return value is ignored. ;; @@ -847,8 +847,8 @@ ;; Awk regexps written with help from Peter Galbraith ;; <galbraith@mixing.qc.dfo.ca>. -;; Take GNU Emacs's 'words out of the following regexp-opts. They dont work -;; in Xemacs 21.4.4. acm 2002/9/19. +;; Take GNU Emacs's 'words out of the following regexp-opts. They don't work +;; in XEmacs 21.4.4. acm 2002/9/19. (defconst awk-font-lock-keywords (eval-when-compile (list diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index e59fdc16af7..68f31c55e71 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el @@ -1042,7 +1042,7 @@ reindented unless `c-syntactic-indentation' is nil. (setcar (car elem) 'label)) (setq elem (cdr elem))) ;; some language elements can only be determined by checking - ;; the following line. Lets first look for ones that can be + ;; the following line. Let's first look for ones that can be ;; found when looking on the line with the colon (setq newlines (and c-auto-newline @@ -2969,7 +2969,7 @@ A prefix argument acts as a repeat count. With a negative argument, move backward across a preprocessor conditional. If there aren't enough conditionals after \(or before) point, an -error is signalled. +error is signaled. \"#elif\" is treated like \"#else\" followed by \"#if\", except that the nesting level isn't changed when tracking subconditionals. @@ -4094,7 +4094,7 @@ command to conveniently insert and align the necessary backslashes." ; (or (<= (- (cdr c-lit-limits) 2) (point)) ; 2010-10-17 Construct removed. ; (or (< (- (cdr c-lit-limits) 2) (point)) - (and + (and (search-forward-regexp (concat "\\=[ \t]*\\(" c-current-comment-prefix "\\)") (- (cdr c-lit-limits) 2) t) diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el index 8632807f2b8..fb9fd406ef8 100644 --- a/lisp/progmodes/cc-defs.el +++ b/lisp/progmodes/cc-defs.el @@ -555,7 +555,7 @@ certain situations." `(c-forward-sexp ,(if (numberp count) (- count) `(- ,count)))) (defmacro c-safe-scan-lists (from count depth &optional limit) - "Like `scan-lists' but returns nil instead of signalling errors + "Like `scan-lists' but returns nil instead of signaling errors for unbalanced parens. A limit for the search may be given. FROM is assumed to be on the @@ -760,7 +760,7 @@ be after it." ;; non-nil if point (or the optional parameter POS) is at a VS, nil otherwise. ;; ;; The language specific function might well do extensive analysis of the -;; source text, and may use a cacheing scheme to speed up repeated calls. +;; source text, and may use a caching scheme to speed up repeated calls. ;; ;; The "virtual semicolon" lies just after the last non-ws token on the line. ;; Like POINT, it is considered to lie between two characters. For example, @@ -784,7 +784,7 @@ be after it." ;; `c-beginning-of-statement-1'. `c-vsemi-status-unknown-p' may not itself ;; call `c-beginning-of-statement-1'. ;; -;; The macro `c-vsemi-status-unknown-p' will typically check the cacheing +;; The macro `c-vsemi-status-unknown-p' will typically check the caching ;; scheme used by the `c-at-vsemi-p-fn', hence the name - the status is ;; "unknown" if there is no cache entry current for the line. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index ea0a8f2d3b3..8ac38c253fb 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -988,7 +988,7 @@ comment at the start of cc-engine.el for more info." ;; Just gone back over an ordinary symbol of some sort? (t (c-crosses-statement-barrier-p (point) maybe-after-boundary-pos)))) - + (when boundary-pos (setq pptok ptok ptok tok @@ -1065,7 +1065,7 @@ comment at the start of cc-engine.el for more info." pos tok) ; always non-nil ) ; end of (catch loop ....) ) ; end of sexp-at-a-time (while ....) - + ;; If the stack isn't empty there might be errors to report. (while stack (if (and (vectorp saved-pos) (eq (length saved-pos) 3)) @@ -1795,7 +1795,7 @@ comment at the start of cc-engine.el for more info." rung-is-marked simple-ws-beg cmt-skip-pos) ;; Skip simple horizontal ws and do a quick check on the preceding - ;; character to see if it's anying that can't end syntactic ws, so we can + ;; character to see if it's anything that can't end syntactic ws, so we can ;; bail out early in the majority of cases when there just are a few ws ;; chars. Newlines are complicated in the backward direction, so we can't ;; skip over them. @@ -2032,7 +2032,7 @@ comment at the start of cc-engine.el for more info." (defconst c-state-cache-too-far 5000) ;; A maximum comfortable scanning distance, e.g. between ;; `c-state-cache-good-pos' and "HERE" (where we call c-parse-state). When -;; this distance is exceeded, we take "emergency meausures", e.g. by clearing +;; this distance is exceeded, we take "emergency measures", e.g. by clearing ;; the cache and starting again from point-min or a beginning of defun. This ;; value can be tuned for efficiency or set to a lower value for testing. @@ -2302,7 +2302,7 @@ comment at the start of cc-engine.el for more info." ;; `c-parse-state', or nil. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Defuns which analyse the buffer, yet don't change `c-state-cache'. +;; Defuns which analyze the buffer, yet don't change `c-state-cache'. (defun c-get-fallback-scan-pos (here) ;; Return a start position for building `c-state-cache' from ;; scratch. This will be at the top level, 2 defuns back. @@ -2331,7 +2331,7 @@ comment at the start of cc-engine.el for more info." ;; ;; If there aren't enough opening paren/brace/brackets, return the position ;; of the outermost one found, or HERE- if there are none. If there are no - ;; closeing p/b/bs between HERE+ and TOP, return HERE-. HERE-/+ and TOP + ;; closing p/b/bs between HERE+ and TOP, return HERE-. HERE-/+ and TOP ;; must not be inside literals. Only the accessible portion of the buffer ;; will be scanned. @@ -2820,7 +2820,7 @@ comment at the start of cc-engine.el for more info." ; or `here' itself. here- here+ ; start/end of macro around HERE, or HERE (here-bol (c-point 'bol here)) - (too-far-back (max (- here c-state-cache-too-far) 1))) + (too-far-back (max (- here c-state-cache-too-far) (point-min)))) ;; Remove completely irrelevant entries from `c-state-cache'. (while (and c-state-cache @@ -2964,9 +2964,9 @@ comment at the start of cc-engine.el for more info." c-state-cache-good-pos nil c-state-min-scan-pos nil) -;;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value below -;;; `here'. To maintain its consistency, we may need to insert a new brace -;;; pair. + ;; Truncate `c-state-cache' and set `c-state-cache-good-pos' to a value + ;; below `here'. To maintain its consistency, we may need to insert a new + ;; brace pair. (let ((here-bol (c-point 'bol here)) too-high-pa ; recorded {/(/[ next above here, or nil. dropped-cons ; was the last removed element a brace pair? @@ -4051,7 +4051,7 @@ comment at the start of cc-engine.el for more info." ;; a relevant match. (goto-char pos) nil)))))) - + (> (point) (progn ;; Skip syntactic ws afterwards so that we don't stop at the @@ -4219,9 +4219,9 @@ comment at the start of cc-engine.el for more info." ;; complicated anyway. In this case, lim is only used to detect ;; cpp directives. ;; -;; Note that there is a bug in Xemacs's buffer-syntactic-context when used in +;; Note that there is a bug in XEmacs's buffer-syntactic-context when used in ;; conjunction with syntax-table-properties. The bug is present in, e.g., -;; Xemacs 21.4.4. It manifested itself thus: +;; XEmacs 21.4.4. It manifested itself thus: ;; ;; Starting with an empty AWK Mode buffer, type ;; /regexp/ {<C-j> @@ -4235,7 +4235,7 @@ comment at the start of cc-engine.el for more info." ;; ;; The workaround for this is for the AWK Mode initialisation to switch the ;; defalias for c-in-literal to c-slow-in-literal. This will slow down other -;; cc-modes in Xemacs whenever an awk-buffer has been initialised. +;; cc-modes in XEmacs whenever an awk-buffer has been initialised. ;; ;; (Alan Mackenzie, 2003/4/30). @@ -6277,7 +6277,7 @@ comment at the start of cc-engine.el for more info." ;; car ^ ^ point ;; Foo::Foo (int b) : Base (b) {} ;; car ^ ^ point - ;; + ;; ;; The cdr of the return value is non-nil when a ;; `c-typedef-decl-kwds' specifier is found in the declaration. ;; Specifically it is a dotted pair (A . B) where B is t when a @@ -6285,7 +6285,7 @@ comment at the start of cc-engine.el for more info." ;; other `c-typedef-decl-kwds' (e.g. class, struct, enum) ;; specifier is present. I.e., (some of) the declared ;; identifier(s) are types. - ;; + ;; ;; If a cast is parsed: ;; ;; The point is left at the first token after the closing paren of @@ -8461,7 +8461,7 @@ comment at the start of cc-engine.el for more info." nil) (t nil)))) (eolp)) - + (goto-char pos) (progn (c-backward-syntactic-ws) (eq (point) pos)) @@ -8832,7 +8832,7 @@ comment at the start of cc-engine.el for more info." ;; CASE B.4: Continued statement with block open. The most ;; accurate analysis is perhaps `statement-cont' together with ;; `block-open' but we play DWIM and use `substatement-open' - ;; instead. The rationaly is that this typically is a macro + ;; instead. The rationale is that this typically is a macro ;; followed by a block which makes it very similar to a ;; statement with a substatement block. (t @@ -8922,7 +8922,7 @@ comment at the start of cc-engine.el for more info." ;; FIXME: Should use c-add-stmt-syntax, but it's not yet ;; template aware. (c-add-syntax 'template-args-cont (point) placeholder)) - + ;; CASE D: continued statement. (t (c-beginning-of-statement-1 containing-sexp) diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 9a83d5196db..a5a9582315b 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -317,7 +317,7 @@ (match-beginning ,(car highlight)) (match-end ,(car highlight)) ,(elt highlight 1)))) - ;; highlight is an "ANCHORED HIGHLIGHER" of the form + ;; highlight is an "ANCHORED HIGHLIGHTER" of the form ;; (ANCHORED-MATCHER PRE-FORM POST-FORM SUBEXP-HIGHLIGHTERS...) (when (nth 3 highlight) (error "Match highlights currently not supported in %s" @@ -1103,7 +1103,7 @@ casts and declarations are fontified. Used on level 2 and higher." (<= (point) limit)) ;; Search syntactically to the end of the declarator (";", - ;; ",", a closen paren, eob etc) or to the beginning of an + ;; ",", a closing paren, eob etc) or to the beginning of an ;; initializer or function prototype ("=" or "\\s\("). ;; Note that the open paren will match array specs in ;; square brackets, and we treat them as initializers too. diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el index 09f8b318378..e1fb69c30c8 100644 --- a/lisp/progmodes/cc-langs.el +++ b/lisp/progmodes/cc-langs.el @@ -3012,6 +3012,14 @@ i.e. before \":\". Only used if `c-recognize-colon-labels' is set." c++ (concat "\\s\(\\|" (c-lang-const c-nonlabel-token-key))) (c-lang-defvar c-nonlabel-token-key (c-lang-const c-nonlabel-token-key)) +(c-lang-defconst c-nonlabel-token-2-key + "Regexp matching things that can't occur two symbols before a colon in +a label construct. This catches C++'s inheritance construct \"class foo +: bar\". Only used if `c-recognize-colon-labels' is set." + t "\\<\\>" ; matches nothing + c++ (c-make-keywords-re t '("class"))) +(c-lang-defvar c-nonlabel-token-2-key (c-lang-const c-nonlabel-token-2-key)) + (c-lang-defconst c-opt-extra-label-key "Optional regexp matching labels. Normally, labels are detected according to `c-nonlabel-token-key', diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index a6bf241f0db..d93d174047b 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -484,7 +484,7 @@ that requires a literal mode spec at compile time." (make-local-variable 'comment-start) (make-local-variable 'comment-end) (make-local-variable 'comment-start-skip) - + (make-local-variable 'paragraph-start) (make-local-variable 'paragraph-separate) (make-local-variable 'paragraph-ignore-fill-prefix) @@ -660,7 +660,7 @@ compatible with old code; callers should always specify it." (when (eq (car elt) 'c-file-style) (setq cownt (1+ cownt)))) cownt)) - + (defun c-before-hack-hook () "Set the CC Mode style and \"offsets\" when in the buffer's local variables. They are set only when, respectively, the pseudo variables @@ -860,7 +860,7 @@ Note that the style variables are always made local to the buffer." ;; (i) Extend the font lock region to cover all changed preprocessor ;; regions; it does this by setting the variables `c-new-BEG' and ;; `c-new-END' to the new boundaries. - ;; + ;; ;; (ii) "Neutralize" every preprocessor line wholly or partially in the ;; extended changed region. "Restore" lines which were CPP lines before the ;; change and are no longer so; these can be located from the Buffer local @@ -1562,7 +1562,7 @@ Key bindings: (c-common-init 'awk-mode) (c-awk-unstick-NL-prop) - ;; Prevent Xemacs's buffer-syntactic-context being used. See the comment + ;; Prevent XEmacs's buffer-syntactic-context being used. See the comment ;; in cc-engine.el, just before (defun c-fast-in-literal ... (defalias 'c-in-literal 'c-slow-in-literal) diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 24361e3667a..02256ead392 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -963,7 +963,7 @@ this is `c-lineup-ObjC-method-call', which would align it like: [foo blahBlahBlah: fred thisIsTooDamnLong: barney -This behaviour can be overridden by customizing the indentation of +This behavior can be overridden by customizing the indentation of `objc-method-call-cont' in the \"objc\" style." :type 'integer :group 'c) @@ -1327,7 +1327,7 @@ Here is the current list of valid syntactic element symbols: statement-case-open -- The first line in a case block starting with brace. substatement -- The first line after an if/while/for/do/else. substatement-open -- The brace that opens a substatement block. - substatement-label -- Labelled line after an if/while/for/do/else. + substatement-label -- Labeled line after an if/while/for/do/else. case-label -- A \"case\" or \"default\" label. access-label -- C++ private/protected/public access label. label -- Any ordinary label. @@ -1625,7 +1625,7 @@ names).")) (defvar c-macro-with-semi-re nil ;; Regular expression which matches a (#define'd) symbol whose expansion ;; ends with a semicolon. - ;; + ;; ;; This variable should be set by `c-make-macros-with-semi-re' rather than ;; directly. ) @@ -1651,7 +1651,7 @@ names).")) (t (error "c-make-macro-with-semi-re: invalid \ c-macro-names-with-semicolon: %s" c-macro-names-with-semicolon)))))) - + (defvar c-macro-names-with-semicolon '("Q_OBJECT" "Q_PROPERTY" "Q_DECLARE" "Q_ENUMS") "List of #defined symbols whose expansion ends with a semicolon. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 156c90159cd..73e990e2755 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -157,7 +157,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) (python-tracebacks-and-caml "^[ \t]*File \\(\"?\\)\\([^,\" \n\t<>]+\\)\\1, lines? \\([0-9]+\\)-?\\([0-9]+\\)?\\(?:$\\|,\ -\\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning:\\)?\\)" +\\(?: characters? \\([0-9]+\\)-?\\([0-9]+\\)?:\\)?\\([ \n]Warning\\(?: [0-9]+\\)?:\\)?\\)" 2 (3 . 4) (5 . 6) (7)) (comma @@ -1013,11 +1013,11 @@ POS and RES.") (setq col (funcall col)) (and (setq col (match-string-no-properties col)) - (setq col (- (string-to-number col) compilation-first-column))))) + (setq col (string-to-number col))))) (if (and end-col (functionp end-col)) (setq end-col (funcall end-col)) (if (and end-col (setq end-col (match-string-no-properties end-col))) - (setq end-col (- (string-to-number end-col) compilation-first-column -1)) + (setq end-col (- (string-to-number end-col) -1)) (if end-line (setq end-col -1)))) (if (consp type) ; not a static type, check what it is. (setq type (or (and (car type) (match-end (car type)) 1) @@ -1037,6 +1037,7 @@ POS and RES.") "Go to column COL on the current line. If SCREEN is non-nil, columns are screen columns, otherwise, they are just char-counts." + (setq col (- col compilation-first-column)) (if screen (move-to-column (max col 0)) (goto-char (min (+ (line-beginning-position) col) (line-end-position))))) @@ -1056,7 +1057,7 @@ FMTS is a list of format specs for transforming the file name. (cadr (compilation--file-struct->loc-tree file-struct))) (marker (if marker-line (compilation--loc->marker (cadr marker-line)))) - (compilation-error-screen-columns compilation-error-screen-columns) + (screen-columns compilation-error-screen-columns) end-marker loc end-loc) (if (not (and marker (marker-buffer marker))) (setq marker nil) ; no valid marker for this file @@ -1064,16 +1065,21 @@ FMTS is a list of format specs for transforming the file name. (catch 'marker ; find nearest loc, at least one exists (dolist (x (cddr (compilation--file-struct->loc-tree file-struct))) ; Loop over remaining lines. - (if (> (car x) loc) ; still bigger + (if (> (car x) loc) ; Still bigger. (setq marker-line x) (if (> (- (or (car marker-line) 1) loc) - (- loc (car x))) ; current line is nearer + (- loc (car x))) ; Current line is nearer. (setq marker-line x)) (throw 'marker t)))) (setq marker (compilation--loc->marker (cadr marker-line)) marker-line (or (car marker-line) 1)) (with-current-buffer (marker-buffer marker) - (save-excursion + (let ((screen-columns + ;; Obey the compilation-error-screen-columns of the target + ;; buffer if its major mode set it buffer-locally. + (if (local-variable-p 'compilation-error-screen-columns) + compilation-error-screen-columns screen-columns))) + (save-excursion (save-restriction (widen) (goto-char (marker-position marker)) @@ -1081,17 +1087,15 @@ FMTS is a list of format specs for transforming the file name. (beginning-of-line (- (or end-line line) marker-line -1)) (if (or (null end-col) (< end-col 0)) (end-of-line) - (compilation-move-to-column - end-col compilation-error-screen-columns)) + (compilation-move-to-column end-col screen-columns)) (setq end-marker (point-marker))) (beginning-of-line (if end-line (- line end-line -1) (- loc marker-line -1))) (if col - (compilation-move-to-column - col compilation-error-screen-columns) + (compilation-move-to-column col screen-columns) (forward-to-indentation 0)) - (setq marker (point-marker)))))) + (setq marker (point-marker))))))) (setq loc (compilation-assq line (compilation--file-struct->loc-tree file-struct))) @@ -2266,7 +2270,7 @@ This is the value of `next-error-function' in Compilation buffers." (interactive "p") (when reset (setq compilation-current-error nil)) - (let* ((columns compilation-error-screen-columns) ; buffer's local value + (let* ((screen-columns compilation-error-screen-columns) (last 1) (msg (compilation-next-error (or n 1) nil (or compilation-current-error @@ -2301,29 +2305,34 @@ This is the value of `next-error-function' in Compilation buffers." marker (caar (compilation--loc->file-struct loc)) (cadr (car (compilation--loc->file-struct loc)))) - (save-restriction - (widen) - (goto-char (point-min)) - ;; Treat file's found lines in forward order, 1 by 1. - (dolist (line (reverse (cddr (compilation--loc->file-struct loc)))) - (when (car line) ; else this is a filename w/o a line# - (beginning-of-line (- (car line) last -1)) - (setq last (car line))) - ;; Treat line's found columns and store/update a marker for each. - (dolist (col (cdr line)) - (if (compilation--loc->col col) - (if (eq (compilation--loc->col col) -1) - ;; Special case for range end. - (end-of-line) - (compilation-move-to-column (compilation--loc->col col) - columns)) - (beginning-of-line) - (skip-chars-forward " \t")) - (if (compilation--loc->marker col) - (set-marker (compilation--loc->marker col) (point)) - (setf (compilation--loc->marker col) (point-marker))) - ;; (setf (compilation--loc->timestamp col) timestamp) - ))))) + (let ((screen-columns + ;; Obey the compilation-error-screen-columns of the target + ;; buffer if its major mode set it buffer-locally. + (if (local-variable-p 'compilation-error-screen-columns) + compilation-error-screen-columns screen-columns))) + (save-restriction + (widen) + (goto-char (point-min)) + ;; Treat file's found lines in forward order, 1 by 1. + (dolist (line (reverse (cddr (compilation--loc->file-struct loc)))) + (when (car line) ; else this is a filename w/o a line# + (beginning-of-line (- (car line) last -1)) + (setq last (car line))) + ;; Treat line's found columns and store/update a marker for each. + (dolist (col (cdr line)) + (if (compilation--loc->col col) + (if (eq (compilation--loc->col col) -1) + ;; Special case for range end. + (end-of-line) + (compilation-move-to-column (compilation--loc->col col) + screen-columns)) + (beginning-of-line) + (skip-chars-forward " \t")) + (if (compilation--loc->marker col) + (set-marker (compilation--loc->marker col) (point)) + (setf (compilation--loc->marker col) (point-marker))) + ;; (setf (compilation--loc->timestamp col) timestamp) + )))))) (compilation-goto-locus marker (compilation--loc->marker loc) (compilation--loc->marker end-loc)) (setf (compilation--loc->visited loc) t))) diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index ad3b777977c..ca596023151 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -902,7 +902,7 @@ the settings present before the switch. 9) When doing indentation of control constructs, may correct line-breaks/spacing between elements of the construct. -10) Uses a linear-time algorith for indentation of regions (on Emaxen with +10) Uses a linear-time algorithm for indentation of regions (on Emaxen with capable syntax engines). 11) Syntax-highlight, indentation, sexp-recognition inside regular expressions. @@ -927,7 +927,7 @@ syntax-parsing routines, and marks them up so that either A1) CPerl may work around these deficiencies (for big chunks, mostly PODs and HERE-documents), or - A2) On capable Emaxen CPerl will use improved syntax-handlings + A2) On capable Emaxen CPerl will use improved syntax-handling which reads mark-up hints directly. The scan in case A2 is much more comprehensive, thus may be slower. @@ -1304,7 +1304,7 @@ versions of Emacs." (get-text-property (point) 'syntax-type)) '(here-doc pod))] "----" - ["CPerl pretty print (exprmntl)" cperl-ps-print + ["CPerl pretty print (experimental)" cperl-ps-print (fboundp 'ps-extend-face-list)] "----" ["Syntaxify region" cperl-find-pods-heres-region @@ -1512,7 +1512,7 @@ the last)." (defvar cperl-font-locking nil) ;; NB as it stands the code in cperl-mode assumes this only has one -;; element. If Xemacs 19 support were dropped, this could all be simplified. +;; element. If XEmacs 19 support were dropped, this could all be simplified. (defvar cperl-compilation-error-regexp-alist ;; This look like a paranoiac regexp: could anybody find a better one? (which WORKS). '(("^[^\n]* \\(file\\|at\\) \\([^ \t\n]+\\) [^\n]*line \\([0-9]+\\)[\\., \n]" @@ -4540,7 +4540,7 @@ the sections using `cperl-pod-head-face', `cperl-pod-face', (forward-char 2)) (and (eq (following-char) ?\] ) (forward-char 1))) - (setq REx-subgr-end qtag) ;EndOf smart-highlighed + (setq REx-subgr-end qtag) ;End smart-highlighted ;; Apparently, I can't put \] into a charclass ;; in m]]: m][\\\]\]] produces [\\]] ;;; POSIX? [:word:] [:^word:] only inside [] @@ -5793,7 +5793,7 @@ indentation and initial hashes. Behaves usually outside of comment." ;; "\\|") '("-[rwxoRWXOezsfdlpSbctugkTBMAC]\\>\\([ \t]+_\\>\\)?" 0 font-lock-function-name-face keep) ; Not very good, triggers at "[a-z]" - ;; This highlights declarations and definitions differenty. + ;; This highlights declarations and definitions differently. ;; We do not try to highlight in the case of attributes: ;; it is already done by `cperl-find-pods-heres' (list (concat "\\<sub" @@ -6481,7 +6481,7 @@ are CPerl, PerlStyle, GNU, K&R, BSD, C++ and Whitesmith. The current value of style is memorized (unless there is a memorized data already), may be restored by `cperl-set-style-back'. -Chosing \"Current\" style will not change style, so this may be used for +Choosing \"Current\" style will not change style, so this may be used for side-effect of memorizing only. Examples in `cperl-style-examples'." (interactive (let ((list (mapcar (function (lambda (elt) (list (car elt)))) @@ -8946,7 +8946,7 @@ do extra unwind via `cperl-unwind-to-safe'." ;; Called when any modification is made to buffer text. (defun cperl-after-change-function (beg end old-len) ;; We should have been informed about changes by `font-lock'. Since it - ;; does not inform as which calls are defered, do it ourselves + ;; does not inform as which calls are deferred, do it ourselves (if cperl-syntax-done-to (setq cperl-syntax-done-to (min cperl-syntax-done-to beg)))) diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index b4094914d61..d855861d552 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -512,7 +512,7 @@ Variables controlling indentation style and extra features: dcl-block-begin-regexp dcl-block-end-regexp Regexps that match command lines that begin and end, respectively, - a block of commmand lines that will be given extra indentation. + a block of command lines that will be given extra indentation. Command lines between THEN-ELSE-ENDIF are always indented; these variables make it possible to define other places to indent. Set to nil to disable this feature. diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el index e8e2f8ffbf0..e513b617022 100644 --- a/lisp/progmodes/delphi.el +++ b/lisp/progmodes/delphi.el @@ -1959,10 +1959,6 @@ comment block. If not in a // comment, just does a normal newline." kmap) "Keymap used in Delphi mode.") -(defvar delphi-mode-syntax-table nil - "Delphi mode's syntax table. It is just a standard syntax table. -This is ok since we do our own keyword/comment/string face coloring.") - ;;;###autoload (define-derived-mode delphi-mode prog-mode "Delphi" "Major mode for editing Delphi code. \\<delphi-mode-map> diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el index f7965d2cd01..d9adff6c8b8 100644 --- a/lisp/progmodes/ebnf2ps.el +++ b/lisp/progmodes/ebnf2ps.el @@ -2084,7 +2084,7 @@ special." "*Specify extra width for arrow shape drawing. The extra width is used to avoid that the arrowhead and the terminal border -overlap. It depens on `ebnf-arrow-shape' and `ebnf-line-width'." +overlap. It depends on `ebnf-arrow-shape' and `ebnf-line-width'." :type 'number :version "22" :group 'ebnf-shape) @@ -4007,7 +4007,7 @@ See documentation for `ebnf-terminal-shape', `ebnf-non-terminal-shape' and /#ebnf2ps#dict 230 dict def #ebnf2ps#dict begin -% Initiliaze variables to avoid name-conflicting with document variables. +% Initialize variables to avoid name-conflicting with document variables. % This is the case when using `bind' operator. /-fillp- 0 def /h 0 def /-ox- 0 def /half 0 def @@ -5037,7 +5037,7 @@ killed after process termination." (when gen-func (setq error-msg "EMPTY RULES" tree (ebnf-eliminate-empty-rules tree)) - (setq error-msg "OPTMIZE" + (setq error-msg "OPTIMIZE" tree (ebnf-optimize tree)) (setq error-msg "DIMENSIONS" tree (ebnf-dimensions tree)) @@ -6069,7 +6069,7 @@ killed after process termination." (defun ebnf-make-terminal1 (name gen-func dim-func) - (vector gen-func ; 0 generatore + (vector gen-func ; 0 generator 'ignore ; 1 width fun dim-func ; 2 dimension fun 0.0 ; 3 entry diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index d321e9c1388..13cba0fe701 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -1144,7 +1144,7 @@ error message." (setq order tag-order)) ;; We throw out on match, so only get here if there were no matches. ;; Clear out the markers we use to avoid duplicate matches so they - ;; don't slow down editting and are immediately available for GC. + ;; don't slow down editing and are immediately available for GC. (while tag-lines-already-matched (set-marker (car tag-lines-already-matched) nil nil) (setq tag-lines-already-matched (cdr tag-lines-already-matched))) diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el index d8133cb6b90..281fa3cef72 100644 --- a/lisp/progmodes/executable.el +++ b/lisp/progmodes/executable.el @@ -268,12 +268,16 @@ file modes." (save-restriction (widen) (string= "#!" (buffer-substring (point-min) (+ 2 (point-min))))) - (let* ((current-mode (file-modes (buffer-file-name))) - (add-mode (logand ?\111 (default-file-modes)))) - (or (/= (logand ?\111 current-mode) 0) - (zerop add-mode) - (set-file-modes (buffer-file-name) - (logior current-mode add-mode)))))) + (condition-case nil + (let* ((current-mode (file-modes (buffer-file-name))) + (add-mode (logand ?\111 (default-file-modes)))) + (or (/= (logand ?\111 current-mode) 0) + (zerop add-mode) + (set-file-modes (buffer-file-name) + (logior current-mode add-mode)))) + ;; Eg file-modes can return nil (bug#9879). It should not, + ;; in this context, but we should handle it all the same. + (error (message "Unable to make file executable"))))) (provide 'executable) diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el index 007203a8b21..ce04d8b390e 100644 --- a/lisp/progmodes/f90.el +++ b/lisp/progmodes/f90.el @@ -1837,7 +1837,7 @@ after indenting." (and (< (point) pos) (goto-char pos)) (if auto-fill-function - ;; GM NO-UPDATE not honoured, since this calls f90-update-line. + ;; GM NO-UPDATE not honored, since this calls f90-update-line. (f90-do-auto-fill) (or no-update (f90-update-line))) (set-marker pos nil))) diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index fd3d42685f0..e98ca58f3e0 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -29,7 +29,7 @@ ;; form. For editing Fortran 90 free format source, use `f90-mode' ;; (f90.el). It is meant to support the GNU Fortran language ;; implemented by g77 (its extensions to Fortran77 and -;; interpretations, e.g. of blackslash in strings). +;; interpretations, e.g. of backslash in strings). ;;; History: @@ -571,7 +571,7 @@ in the Fortran entry in `hs-special-modes-alist'.") ;; An alternative is to match on THEN at a line end, eg: ;; ".*)[ \t]*then[ \t]*\\($\\|!\\)" ;; This would also match ELSE branches, though. This does not seem - ;; right to me, because then one has neighbouring blocks that are + ;; right to me, because then one has neighboring blocks that are ;; not nested in each other. "\\(if[ \t]*(\\(.*\\|" ".*\n\\([^if]*\\([^i].\\|.[^f]\\|.\\>\\)\\)\\)\\<then\\|" @@ -1462,7 +1462,7 @@ Return point or nil." (defun fortran-beginning-do () "Search backwards for first unmatched DO [WHILE]. -Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." +Return point or nil. Ignores labeled DO loops (ie DO 10 ... 10 CONTINUE)." (let ((case-fold-search t) (dostart-re "\\(\\(\\sw\\|\\s_\\)+:[ \t]*\\)?do[ \t]+[^0-9]")) (if (save-excursion @@ -1482,7 +1482,7 @@ Return point or nil. Ignores labelled DO loops (ie DO 10 ... 10 CONTINUE)." (skip-chars-forward " \t0-9") (cond ((looking-at dostart-re) (setq count (1- count))) - ;; Note labelled loop ends not considered. + ;; Note labeled loop ends not considered. ((looking-at "end[ \t]*do\\b") (setq count (1+ count))))) (and (zerop count) diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index f9ddabf1552..7d31fb63e91 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -25,7 +25,7 @@ ;;; Credits: -;; This file was written by by Nick Roberts following the general design +;; This file was written by Nick Roberts following the general design ;; used in gdb-ui.el for Emacs 22.1 - 23.1. It is currently being developed ;; by Dmitry Dzhus <dima@sphinx.net.ru> as part of the Google Summer ;; of Code 2009 Project "Emacs GDB/MI migration". @@ -350,7 +350,7 @@ automatically. This setting is used in non-stop mode only. In all-stop mode, Emacs always switches to the thread which caused the stop." - ;; exited, exited-normally and exited-signalled are not + ;; exited, exited-normally and exited-signaled are not ;; thread-specific stop reasons and therefore are not included in ;; this list :type '(choice @@ -1965,7 +1965,7 @@ Sets `gdb-thread-number' to new id." (setq gud-running t) ;; GDB doesn't seem to respond to -thread-info before first stop or ;; thread exit (even in non-stop mode), so this is useless. - ;; Behaviour may change in the future. + ;; Behavior may change in the future. (gdb-emit-signal gdb-buf-publisher 'update-threads)) ;; -break-insert -t didn't give a reason before gdb 6.9 @@ -2217,7 +2217,7 @@ Return position where LINE begins." (defun gdb-mapcar* (function &rest seqs) "Apply FUNCTION to each element of SEQS, and make a list of the results. If there are several SEQS, FUNCTION is called with that many -arugments, and mapping stops as sson as the shortest list runs +arguments, and mapping stops as soon as the shortest list runs out." (let ((shortest (apply #'min (mapcar #'length seqs)))) (mapcar (lambda (i) @@ -3428,7 +3428,7 @@ breakpoints buffer." (error "Not recognized as break/watchpoint line"))))) -;; Frames buffer. This displays a perpetually correct bactrack trace. +;; Frames buffer. This displays a perpetually correct backtrack trace. ;; (def-gdb-trigger-and-handler gdb-invalidate-frames (gdb-current-context-command "-stack-list-frames") diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index ff192d5678e..dbffbc266e7 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -339,7 +339,7 @@ See `compilation-error-screen-columns'" "The most recent grep buffer. A grep buffer becomes most recent when you select Grep mode in it. Notice that using \\[next-error] or \\[compile-goto-error] modifies -`complation-last-buffer' rather than `grep-last-buffer'.") +`compilation-last-buffer' rather than `grep-last-buffer'.") ;;;###autoload (defconst grep-regexp-alist diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 7b3a2893610..c60e8d72abc 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -2016,7 +2016,7 @@ extension EXTN. Normally EXTN is given as the regular expression ((looking-at "final") (forward-char 5)) - ;; Move point past a ClassDeclaraction, but save the class + ;; Move point past a ClassDeclaration, but save the class ;; Identifier. ((looking-at "class") (forward-char 5) @@ -2102,7 +2102,7 @@ extension EXTN. Normally EXTN is given as the regular expression massaged-args))) ;; Search for an association with P, a fully qualified class name, in -;; gud-jdb-class-source-alist. The asssociation gives the fully +;; gud-jdb-class-source-alist. The association gives the fully ;; qualified file name of the source file which produced the class. (defun gud-jdb-find-source-file (p) (cdr (assoc p gud-jdb-class-source-alist))) @@ -2155,7 +2155,7 @@ during jdb initialization depending on the value of string (concat "[ \t\n\r,\"" path-separator "]+"))))) -;; See comentary for other debugger's marker filters - there you will find +;; See commentary for other debugger's marker filters - there you will find ;; important notes about STRING. (defun gud-jdb-marker-filter (string) @@ -3387,7 +3387,7 @@ This event can be examined by forms in `gud-tooltip-display'.") (defun gud-tooltip-dereference (&optional arg) "Toggle whether tooltips should show `* expr' or `expr'. -With arg, dereference expr if ARG is positive, otherwise do not derereference." +With arg, dereference expr if ARG is positive, otherwise do not dereference." (interactive "P") (setq gud-tooltip-dereference (if (null arg) diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el index 8d8966ee159..2708346f05f 100644 --- a/lisp/progmodes/idlw-help.el +++ b/lisp/progmodes/idlw-help.el @@ -705,7 +705,8 @@ Those words in `idlwave-completion-help-links' have links. The ;; we kill the help frame before the return-frame is selected. ;; To protect the workings, we wait for up to one second ;; and check if the return-frame *is* now selected. - ;; This is marked "eperimental" since we are not sure when its OK. + ;; This is marked "experimental" since we are not sure when + ;; it's OK. (let ((maxtime 1.0) (time 0.) (step 0.1)) (select-frame idlwave-help-return-frame) (while (and (sit-for step) @@ -990,7 +991,7 @@ on a line. Then `NAME:' must be followed by the routine name on the same or the next line. When KEYWORD is non-nil, looks first for a `KEYWORDS' section. It is amazing how inconsisten this is through some IDL libraries I have seen. We settle for a line containing an -upper case \"KEYWORD\" string. If this line is not fould we search +upper case \"KEYWORD\" string. If this line is not found we search for the keyword anyway to increase the hit-rate When one of these sections exists we check for a line starting with any of diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el index 18f47d14a3f..faccbb1f0ca 100644 --- a/lisp/progmodes/idlw-shell.el +++ b/lisp/progmodes/idlw-shell.el @@ -925,7 +925,7 @@ IDL has currently stepped.") \\[idlwave-shell-print] or \\[idlwave-shell-mouse-print] with the mouse, help, \\[idlwave-shell-help-expression] or \\[idlwave-shell-mouse-help] with the mouse, or with a - configureable set of custom examine commands using + configurable set of custom examine commands using \\[idlwave-shell-examine-select]. The mouse examine commands can also work by click and drag, to select an expression for examination. @@ -939,7 +939,7 @@ IDL has currently stepped.") ------------------------------- Info documentation for this package is available. Use \\[idlwave-info] to display (complain to your sysadmin if that does not work). - For Postscript and HTML versions of the documentation, check IDLWAVE's + For PostScript and HTML versions of the documentation, check IDLWAVE's homepage at URL `http://idlwave.org'. IDLWAVE has customize support - see the group `idlwave'. @@ -959,7 +959,7 @@ IDL has currently stepped.") ;; Can not use history expansion because "!" is used for system variables. (setq comint-input-autoexpand nil) ;; (setq comint-input-ring-size 64) - + (set (make-local-variable 'completion-ignore-case) t) (set (make-local-variable 'comint-completion-addsuffix) '("/" . "")) (setq comint-input-ignoredups t) @@ -3707,7 +3707,7 @@ Existing overlays are recycled, in order to minimize consumption." (defun idlwave-shell-make-new-bp-overlay (&optional type disabled) "Make a new overlay for highlighting breakpoints. -This stuff is strongly dependant upon the version of Emacs. If TYPE +This stuff is strongly dependent upon the version of Emacs. If TYPE is passed, make an overlay of that type ('bp or 'bp-cond, currently only for glyphs)." (let ((ov (make-overlay 1 1)) diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el index c77ee4b76a9..1233ee19ff6 100644 --- a/lisp/progmodes/idlwave.el +++ b/lisp/progmodes/idlwave.el @@ -605,7 +605,7 @@ The value of this variable may be nil to inhibit display, or an integer to indicate the maximum number of classes to display. On XEmacs, a full list of classes will also be placed into a `help-echo' -property on the competion items, so that the list of classes for the current +property on the completion items, so that the list of classes for the current item is displayed in the echo area. If the value of this variable is a negative integer, the `help-echo' property will be suppressed." :group 'idlwave-completion @@ -7206,7 +7206,7 @@ If these don't exist, a letter in the string is automatically selected." ;;---------------------------------------------------------------------- ;;; ------------------------------------------------------------------------ -;;; Stucture parsing code, and code to manage class info +;;; Structure parsing code, and code to manage class info ;; ;; - Go again over the documentation how to write a completion @@ -8961,7 +8961,7 @@ This expects NAME TYPE IDLWAVE-TWIN-CLASS to be bound to the right values." (nth 1 source))) (defun idlwave-downcase-safe (string) - "Donwcase if string, else return unchanged." + "Downcase if string, else return unchanged." (if (stringp string) (downcase string) string)) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 5505e8e94b2..0e3fdc78a39 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1295,7 +1295,7 @@ LIMIT defaults to point." ;; Like (up-list -1), but only considers lists that end nearby" (defun js--up-nearby-list () (save-restriction - ;; Look at a very small region so our compuation time doesn't + ;; Look at a very small region so our computation time doesn't ;; explode in pathological cases. (narrow-to-region (max (point-min) (- (point) 500)) (point)) (up-list -1))) @@ -3352,7 +3352,7 @@ If one hasn't been set, or if it's stale, prompt for a new one." ;; etc. and produce maddening "unbalanced parenthesis" errors. ;; When we attempt to find the error and scroll to the portion of ;; the buffer containing the problem, JIT-lock will apply the - ;; correct syntax to the regular expresion literal and the problem + ;; correct syntax to the regular expression literal and the problem ;; will mysteriously disappear. ;; FIXME: We should actually do this fontification lazily by adding ;; calls to syntax-propertize wherever it's really needed. diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el index 293ba49d4ae..c49519ed179 100644 --- a/lisp/progmodes/make-mode.el +++ b/lisp/progmodes/make-mode.el @@ -532,7 +532,7 @@ not be enclosed in { } or ( )." ;; should return an exit status of zero if the target `foo' is ;; up to date and a nonzero exit status otherwise. ;; Many makes can do this although the docs/manpages do not mention -;; it. Try it with your favourite one. GNU make, System V make, and +;; it. Try it with your favorite one. GNU make, System V make, and ;; Dennis Vadura's DMake have no problems. ;; Set the variable `makefile-brave-make' to the name of the ;; make utility that does this on your system. diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el index ab640c0e270..d0a34179cc8 100644 --- a/lisp/progmodes/meta-mode.el +++ b/lisp/progmodes/meta-mode.el @@ -27,53 +27,17 @@ ;; ;; This Emacs Lisp package provides a major mode for editing Metafont ;; or MetaPost sources. It includes all the necessary code to set up -;; a major mode including an approriate syntax table, keymap, and a +;; a major mode including an appropriate syntax table, keymap, and a ;; mode-specific pull-down menu. It also provides a sophisticated set ;; of font-lock patterns, a fancy indentation function adapted from ;; AUCTeX's latex.el, and some basic mode-specific editing functions ;; such as functions to move to the beginning or end of the enclosing ;; environment, or to mark, re-indent, or comment-out environments. ;; On the other hand, it doesn't yet provide any functionality for -;; running Metafont or MetaPost in a shell buffer form within Emacs, +;; running Metafont or MetaPost in a shell buffer from within Emacs, ;; but such functionality might be added later, either as part of this ;; package or as a separate Emacs Lisp package. -;; Installation: -;; -;; An interface to running Metafont or MetaPost as a shell process -;; from within Emacs is currently under development as a separate -;; Emacs Lisp package (meta-buf.el). In order to have that package -;; loaded automatically when first entering Metafont or MetaPost mode, -;; you might use the load-hook provided in this package by adding -;; these lines to your startup file: -;; -;; (add-hook 'meta-mode-load-hook -;; (lambda () (require 'meta-buf))) -;; -;; The add-on package loaded this way may in turn make use of the -;; mode-hooks provided in this package to activate additional features -;; when entering Metafont or MetaPost mode. - -;; Font Lock Support: -;; -;; If you are using global-font-lock-mode (introduced in Emacs 19.31), -;; fontification in Metafont and/or MetaPost mode will be activated -;; automatically. To speed up fontification for the rather complex -;; patterns used in these modes, it may be a good idea to activate -;; lazy-lock as a font-lock-support-mode (introduced in Emacs 19.32) -;; by adding these lines to your startup file: -;; -;; (global-font-lock-mode t) -;; (setq font-lock-support-mode 'lazy-lock-mode) -;; -;; If you are using an older version of Emacs, which doesn't provide -;; global-font-lock-mode or font-lock-support-mode, you can also -;; activate fontification in Metafont and/or MetaPost mode by adding -;; the following lines to your startup file: -;; -;; (add-hook 'meta-common-mode-hook 'turn-on-font-lock) -;; (add-hook 'meta-common-mode-hook 'turn-on-lazy-lock) - ;; Customization: ;; ;; Following the usual Emacs Lisp coding conventions, the major modes @@ -88,10 +52,6 @@ ;; Availability: ;; -;; This package is currently available via my "TeX Software" WWW page: -;; -;; http://www.thphy.uni-duesseldorf.de/~vieth/subjects/tex/software.html -;; ;; As of this version 1.0, this package will be uploaded to CTAN ;; archives, where it shall find a permanent home, presumably in ;; tex-archive/support/emacs-modes. It will also be submitted for @@ -104,7 +64,7 @@ ;; v 0.2 -- 1997/02/03 UV Improved and debugged font-lock patterns. ;; Added indent-line-function for TAB. ;; v 0.3 -- 1997/02/17 UV Improved font-lock patterns and syntax table. -;; Improved and debbuged indentation function. +;; Improved and debugged indentation function. ;; v 0.4 -- 1997/02/18 UV Added functions to indent regions for M-C-q, ;; also added a preliminary mode-specific menu. ;; v 0.5 -- 1997/02/19 UV Added functions to skip to next or previous @@ -201,7 +161,7 @@ "[ \t\f]+\\(\\sw+\\|\\s_+\\|\\s.+\\)") '((1 font-lock-keyword-face) (2 font-lock-function-name-face))) - ;; binary macro defintions: <leveldef> x operator y + ;; binary macro definitions: <leveldef> x operator y (cons (concat "\\<" macro-keywords-2 "\\>" "[ \t\f]+\\(\\sw+\\)" "[ \t\f]*\\(\\sw+\\|\\s.+\\)" @@ -513,13 +473,13 @@ If the list was changed, sort the list and remove duplicates first." :group 'meta-font) (defcustom meta-right-comment-regexp nil - "Regexp matching comments that should be placed to the right margin." + "Regexp matching comments that should be placed on the right margin." :type '(choice regexp (const :tag "None" nil)) :group 'meta-font) (defcustom meta-ignore-comment-regexp "%[^%]" - "Regexp matching comments that whose indentation should not be touched." + "Regexp matching comments whose indentation should not be touched." :type 'regexp :group 'meta-font) @@ -740,7 +700,7 @@ If the list was changed, sort the list and remove duplicates first." (defun meta-beginning-of-defun (&optional arg) - "Move backward to beginnning of a defun in Metafont or MetaPost code. + "Move backward to beginning of a defun in Metafont or MetaPost code. With numeric argument, do it that many times. Negative arg -N means move forward to Nth following beginning of defun. Returns t unless search stops due to beginning or end of buffer." diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index 103c7be7d3c..7d1f12595ab 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el @@ -1058,7 +1058,7 @@ EXECUTION-TIME holds info about the time it takes, number or string.") (list (let* ((completion-ignore-case t) ;; we already have a list, but it is not in the right format - ;; transform it to a valid table so completition can use it + ;; transform it to a valid table so completion can use it (table (mapcar (lambda (elm) (cons (symbol-name (car elm)) nil)) mixal-operation-codes-alist)) ;; prompt is different depending on we are close to a valid op-code diff --git a/lisp/progmodes/modula2.el b/lisp/progmodes/modula2.el index f0b8f7cbca7..0c43a3ed354 100644 --- a/lisp/progmodes/modula2.el +++ b/lisp/progmodes/modula2.el @@ -466,7 +466,7 @@ followed by the first character of the construct. '(m2-var) \n _ \n \n '(m2-begin) '(m2-begin-comment) - " Module " str " Initialisation Code " + " Module " str " Initialization Code " '(m2-end-comment) \n \n "END " str "." > \n) diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el index 57ed13969b4..67e3c4a18b4 100644 --- a/lisp/progmodes/pascal.el +++ b/lisp/progmodes/pascal.el @@ -227,7 +227,7 @@ will do all lineups." :type '(set :extra-offset 8 (const :tag "Everything" all) (const :tag "Parameter lists" paramlist) - (const :tag "Decalrations" declaration) + (const :tag "Declarations" declaration) (const :tag "Case statements" case)) :group 'pascal) diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 283919c131e..ef0905bb2a8 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el @@ -116,7 +116,7 @@ ;; Version 1.22: ;; o Allowed both 'swipl' and 'pl' as names for the SWI Prolog ;; interpreter. -;; o Atoms that start a line are not blindly coloured as +;; o Atoms that start a line are not blindly colored as ;; predicates. Instead we check that they are followed by ( or ;; :- first. Patch suggested by Guy Wiener. ;; Version 1.21: @@ -151,7 +151,7 @@ ;; (`prolog-electric-dot-full-predicate-template', defaults to t ;; since it seems quicker to me to just type those commata). A ;; trivial adaptation of a patch by Markus Triska. -;; o Improved the behaviour of electric if-then-else to only skip +;; o Improved the behavior of electric if-then-else to only skip ;; forward if the parenthesis/semicolon is preceded by ;; whitespace. Once more a trivial adaptation of a patch by ;; Markus Triska. @@ -1023,7 +1023,7 @@ VERSION is of the format (Major . Minor)" (defvar prolog-mode-hook nil - "List of functions to call after the prolog mode has initialised.") + "List of functions to call after the prolog mode has initialized.") (unless (fboundp 'prog-mode) (defalias 'prog-mode 'fundamental-mode)) @@ -1090,7 +1090,7 @@ Actually this is just customized `prolog-mode'." map)) (defvar prolog-inferior-mode-hook nil - "List of functions to call after the inferior prolog mode has initialised.") + "List of functions to call after the inferior prolog mode has initialized.") (defvar prolog-inferior-error-regexp-alist '(;; GNU Prolog used to not follow the GNU standard format. diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el index d60e7513651..7810b377e58 100644 --- a/lisp/progmodes/ps-mode.el +++ b/lisp/progmodes/ps-mode.el @@ -267,7 +267,7 @@ If nil, use `temporary-file-directory'." . (1 font-lock-function-name-face)) '("/\\w+" . font-lock-variable-name-face) (cons ps-mode-operators 'font-lock-keyword-face))) - "High level highliting for PostScript mode.") + "High level highlighting for PostScript mode.") (defconst ps-mode-font-lock-keywords ps-mode-font-lock-keywords-1 "Default expressions to highlight in PostScript mode.") @@ -624,7 +624,7 @@ Typing \\<ps-run-mode-map>\\[ps-run-goto-error] when the cursor is at the number (defun ps-mode-target-column () "To what column should text on current line be indented? -Identation is increased if the last token on the current line +Indentation is increased if the last token on the current line defines the beginning of a group. These tokens are: { [ <<" (save-excursion (beginning-of-line) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 38bf9552b2a..a0a368777e7 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -119,7 +119,7 @@ (1 font-lock-type-face)) ;; Built-ins. (The next three blocks are from ;; `__builtin__.__dict__.keys()' in Python 2.7) These patterns - ;; are debateable, but they at least help to spot possible + ;; are debatable, but they at least help to spot possible ;; shadowing of builtins. (,(rx symbol-start (or ;; exceptions @@ -550,7 +550,7 @@ element matches `python-python-command'." "^> \\(.*\\)(\\([0-9]+\\))\\([?a-zA-Z0-9_<>]+\\)()" "Regular expression pdbtrack uses to find a stack trace entry.") -(defconst python-pdbtrack-input-prompt "\n[(<]*[Pp]db[>)]+ " +(defconst python-pdbtrack-input-prompt "\n[(<]*[Ii]?[Pp]db[>)]+ " "Regular expression pdbtrack uses to recognize a pdb prompt.") (defconst python-pdbtrack-track-range 10000 @@ -948,22 +948,12 @@ Finds end of innermost nested class or method definition." "Go to start of current statement. Accounts for continuation lines, multi-line strings, and multi-line bracketed expressions." - (beginning-of-line) - (python-beginning-of-string) - (let (point) - (while (and (python-continuation-line-p) - (if point - (< (point) point) - t)) - (beginning-of-line) + (while (if (python-backslash-continuation-line-p) - (progn - (forward-line -1) - (while (python-backslash-continuation-line-p) - (forward-line -1))) - (python-beginning-of-string) - (python-skip-out)) - (setq point (point)))) + (progn (forward-line -1) t) + (beginning-of-line) + (or (python-beginning-of-string) + (python-skip-out)))) (back-to-indentation)) (defun python-skip-out (&optional forward syntax) @@ -971,6 +961,7 @@ multi-line bracketed expressions." Skip forward if FORWARD is non-nil, else backward. If SYNTAX is non-nil it is the state returned by `syntax-ppss' at point. Return non-nil if and only if skipping was done." + ;; FIXME: Use syntax-ppss-toplevel-pos. (let ((depth (syntax-ppss-depth (or syntax (syntax-ppss)))) (forward (if forward -1 1))) (unless (zerop depth) @@ -2562,7 +2553,7 @@ If the traceback target file path is invalid, we look for the most recently visited python-mode buffer which either has the name of the current function or class, or which defines the function or class. This is to provide for scripts not in the -local filesytem (e.g., Zope's 'Script \(Python)', but it's not +local file system (e.g., Zope's 'Script \(Python)', but it's not Zope specific). If you put a copy of the script in a buffer named for the script and activate python-mode, then pdbtrack will find it." @@ -2592,6 +2583,7 @@ find it." (if (not (string-match (concat python-pdbtrack-input-prompt "$") block)) (python-pdbtrack-overlay-arrow nil) + (setq block (ansi-color-filter-apply block)) (setq target (python-pdbtrack-get-source-buffer block)) (if (stringp target) diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 7b949134c6c..bca5c93e0a5 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -889,7 +889,7 @@ See `sh-feature'.") font-lock-variable-name-face)) (rc sh-append es) - (bash sh-append shell ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) )) + (bash sh-append sh ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) )) (sh sh-append shell ;; Variable names. ("\\$\\({#?\\)?\\([[:alpha:]_][[:alnum:]_]*\\|[-#?@!]\\)" 2 @@ -985,7 +985,7 @@ Find all the unescaped \" characters within said subshell, remembering that subshells can nest." ;; FIXME: This can (and often does) match multiple lines, yet it makes no ;; effort to handle multiline cases correctly, so it ends up being - ;; rather flakey. + ;; rather flaky. (when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote. ;; bingo we have a $( or a ` inside a "" (let (;; `state' can be: double-quote, backquote, code. diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el index 97a1c4605c2..af9ab537893 100644 --- a/lisp/progmodes/sql.el +++ b/lisp/progmodes/sql.el @@ -672,7 +672,7 @@ highlighted properly when you open them." :safe 'symbolp) (defvaralias 'sql-dialect 'sql-product) -;; misc customization of sql.el behaviour +;; misc customization of sql.el behavior (defcustom sql-electric-stuff nil "Treat some input as electric. @@ -1595,7 +1595,7 @@ to add functions and PL/SQL keywords.") "cast" "ceil" "chartorowid" "chr" "cluster_id" "cluster_probability" "cluster_set" "coalesce" "collect" "compose" "concat" "convert" "corr" "corr_k" "corr_s" "cos" "cosh" "count" "covar_pop" "covar_samp" -"cube_table" "cume_dist" "currrent_date" "currrent_timestamp" "cv" +"cube_table" "cume_dist" "current_date" "current_timestamp" "cv" "dataobj_to_partition" "dbtimezone" "decode" "decompose" "deletexml" "dense_rank" "depth" "deref" "dump" "empty_blob" "empty_clob" "existsnode" "exp" "extract" "extractvalue" "feature_id" "feature_set" @@ -3600,12 +3600,12 @@ The list is maintained in SQL interactive buffers.") (setq has-schema (and (>= (length (car names)) schema-len) (string= schema-dot - (downcase (substring (car names) + (downcase (substring (car names) 0 schema-len)))) names (cdr names))) (unless has-schema (sql-build-completions schema))))) - + ;; Try to find the completion (cond ((not predicate) @@ -3951,7 +3951,7 @@ is specified in the connection settings." ;; interactive session (eval `(let ((sql-connection ,connection) (,param-var ',rem-params)) - (sql-product-interactive sql-product + (sql-product-interactive sql-product new-name))))) (message "SQL Connection <%s> does not exist" connection) @@ -3981,16 +3981,16 @@ optionally is saved to the user's init file." (if connection (message "This session was started by a connection; it's already been saved.") - + (let ((login (sql-get-product-feature product :sqli-login)) (alist sql-connection-alist) connect) - + ;; Remove the existing connection if the user says so (when (and (assoc name alist) (yes-or-no-p (format "Replace connection definition <%s>? " name))) (setq alist (assq-delete-all name alist))) - + ;; Add the new connection if it doesn't exist (if (assoc name alist) (message "Connection <%s> already exists" name) @@ -4747,8 +4747,8 @@ Try to set `comint-output-filter-functions' like this: (sql-redirect sqlbuf "\\t off") (when (not (string= a "aligned")) (sql-redirect sqlbuf "\\a")) - - ;; Return the list of table names (public schema name can be omitted) + + ;; Return the list of table names (public schema name can be omitted) (mapcar (lambda (tbl) (if (string= (car tbl) "public") (cadr tbl) diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index f18ec5abe81..d0e2c5abe7d 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el @@ -861,7 +861,7 @@ Returns nil if line starts inside a string, t if in a comment." expr-p) (progn ;; Line is continuation line, or the sexp opener - ;; is not a curly brace, or we are are looking at + ;; is not a curly brace, or we are looking at ;; an `expr' expression (which must be split ;; specially). So indentation is column of first ;; good spot after sexp opener (with some added diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index f7cb1318dc0..2d8334bcb7d 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -292,7 +292,7 @@ STRING should be given if the last search was by `string-match' on STRING." "Filter `easy-menu-define' MENU to support new features." (cond ((not (featurep 'xemacs)) menu) ;; GNU Emacs - passthru - ;; Xemacs doesn't support :help. Strip it. + ;; XEmacs doesn't support :help. Strip it. ;; Recursively filter the a submenu ((listp menu) (mapcar 'verilog-easy-menu-filter menu)) @@ -737,7 +737,7 @@ See `compilation-error-regexp-alist' for the formatting. For Emacs 22+.") (defvar verilog-error-regexp-xemacs-alist ;; Emacs form is '((v-tool "re" 1 2) ...) ;; XEmacs form is '(verilog ("re" 1 2) ...) - ;; So we can just map from Emacs to Xemacs + ;; So we can just map from Emacs to XEmacs (cons 'verilog (mapcar 'cdr verilog-error-regexp-emacs-alist)) "List of regexps for Verilog compilers. See `compilation-error-regexp-alist-alist' for the formatting. For XEmacs.") @@ -913,7 +913,7 @@ the MSB or LSB of a signal inside an AUTORESET." (put 'verilog-assignment-delay 'safe-local-variable 'stringp) (defcustom verilog-auto-arg-sort nil - "*If set, AUTOARG signal names will be sorted, not in delaration order. + "*If set, AUTOARG signal names will be sorted, not in declaration order. Declaration order is advantageous with order based instantiations and is the default for backward compatibility. Sorted order reduces changes when declarations are moved around in a file, and @@ -1847,7 +1847,7 @@ find the errors." )) (defconst verilog-auto-end-comment-lines-re - ;; Matches to names in this list cause auto-end-commentation + ;; Matches to names in this list cause auto-end-commenting (concat "\\(" verilog-directive-re "\\)\\|\\(" (eval-when-compile @@ -2151,7 +2151,7 @@ find the errors." "interface" "endinterface" "module" "macromodule" "endmodule" "package" "endpackage" - "primitive" "endprimative" + "primitive" "endprimitive" "program" "endprogram" "property" "endproperty" "sequence" "randsequence" "endsequence" @@ -2709,7 +2709,7 @@ either is ok to parse as a non-comment, or `verilog-insert' was used." (remove-text-properties (point-min) (point-max) '(v-cmt nil)) (verilog-scan-region (point-min) (point-max)) (setq verilog-scan-cache-tick (buffer-chars-modified-tick)) - (when verilog-debug (message "Scaning... done")))))) + (when verilog-debug (message "Scanning... done")))))) (defun verilog-inside-comment-p () "Check if point inside a comment. @@ -3579,7 +3579,7 @@ With ARG, first kill any existing labels." "Move backward to beginning of statement." (interactive) ;; Move back token by token until we see the end - ;; of some ealier line. + ;; of some earlier line. (let (h) (while ;; If the current point does not begin a new @@ -5128,7 +5128,7 @@ Set point to where line starts." continued)) (defun verilog-backward-token () - "Step backward token, returing true if this is a continued line." + "Step backward token, returning true if this is a continued line." (interactive) (verilog-backward-syntactic-ws) (cond @@ -11958,7 +11958,7 @@ Files are checked based on `verilog-library-flags'." (mouse-set-point event) (verilog-load-file-at-point t))) -;; ffap isn't useable for Verilog mode. It uses library paths. +;; ffap isn't usable for Verilog mode. It uses library paths. ;; so define this function to do more or less the same as ffap ;; but first resolve filename... (defun verilog-load-file-at-point (&optional warn) diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el index d7aa82aee1b..cd2d45b7856 100644 --- a/lisp/progmodes/vhdl-mode.el +++ b/lisp/progmodes/vhdl-mode.el @@ -58,7 +58,7 @@ ;; - Word/keyword completion ;; - Block commenting ;; - Code fixing/alignment/beautification -;; - Postscript printing +;; - PostScript printing ;; - VHDL'87/'93 and VHDL-AMS supported ;; - Comprehensive menu ;; - Fully customizable @@ -1752,7 +1752,7 @@ NOTE: Activate the new setting in a VHDL buffer by using the menu entry (defcustom vhdl-print-two-column t "*Non-nil means print code in two columns and landscape format. -Adjusts settings in a way that postscript printing (\"File\" menu, `ps-print') +Adjusts settings in a way that PostScript printing (\"File\" menu, `ps-print') prints VHDL files in a nice two-column landscape style. NOTE: Activate the new setting by restarting Emacs. @@ -1761,7 +1761,7 @@ NOTE: Activate the new setting by restarting Emacs. :group 'vhdl-print) (defcustom vhdl-print-customize-faces t - "*Non-nil means use an optimized set of faces for postscript printing. + "*Non-nil means use an optimized set of faces for PostScript printing. NOTE: Activate the new setting by restarting Emacs. Overrides `ps-print' settings locally." @@ -2131,7 +2131,7 @@ Ignore byte-compiler warnings you might see." (if (fboundp 'start-itimer) (start-itimer "vhdl-mode" function secs repeat t) ; (run-with-idle-timer secs repeat function))) - ;; explicitely activate timer (necessary when Emacs is already idle) + ;; explicitly activate timer (necessary when Emacs is already idle) (aset (run-with-idle-timer secs repeat function) 0 nil))) (defun vhdl-warning-when-idle (&rest args) @@ -3117,7 +3117,7 @@ STRING are replaced by `-' and substrings are converted to lower case." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;; Menues +;;; Menus ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -3510,7 +3510,7 @@ STRING are replaced by `-' and substrings are converted to lower case." menu-list)) (setq comp-alist (cdr comp-alist))) (setq menu-list (nreverse menu-list)) - (vhdl-menu-split menu-list "Compler"))) + (vhdl-menu-split menu-list "Compiler"))) ["Use Local Error Regexp" (customize-set-variable 'vhdl-compile-use-local-error-regexp (not vhdl-compile-use-local-error-regexp)) @@ -4567,10 +4567,10 @@ Usage: PRINTING: - Postscript printing with different faces (an optimized set of faces is + PostScript printing with different faces (an optimized set of faces is used if `vhdl-print-customize-faces' is non-nil) or colors \(if `ps-print-color-p' is non-nil) is possible using the standard Emacs - postscript printing commands. Option `vhdl-print-two-column' defines + PostScript printing commands. Option `vhdl-print-two-column' defines appropriate default settings for nice landscape two-column printing. The paper format can be set by option `ps-paper-type'. Do not forget to switch `ps-print-color-p' to nil for printing on black-and-white @@ -12913,10 +12913,10 @@ This does background highlighting of translate-off regions.") (font-lock-mode t)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Initialization for postscript printing +;; Initialization for PostScript printing (defun vhdl-ps-print-settings () - "Initialize custom face and page settings for postscript printing." + "Initialize custom face and page settings for PostScript printing." ;; define custom face settings (unless (or (not vhdl-print-customize-faces) ps-print-color-p) @@ -12951,7 +12951,7 @@ This does background highlighting of translate-off regions.") (set (make-local-variable 'ps-right-margin) 40.0)))) (defun vhdl-ps-print-init () - "Initialize postscript printing." + "Initialize PostScript printing." (if (featurep 'xemacs) (when (boundp 'ps-print-color-p) (vhdl-ps-print-settings)) diff --git a/lisp/ps-samp.el b/lisp/ps-samp.el index 8b652b26082..bfdcd91d26a 100644 --- a/lisp/ps-samp.el +++ b/lisp/ps-samp.el @@ -237,7 +237,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; If zeroconf is enabled, all CUPS printers can be detected. The -;; "Postscript printer" menu will be modified dynamically, as printers +;; "PostScript printer" menu will be modified dynamically, as printers ;; are added or removed. ;; Preconditions: @@ -257,7 +257,7 @@ (require 'printing) (require 'zeroconf) -;; Add a Postscript printer to the "Postscript printer" menu. +;; Add a PostScript printer to the "PostScript printer" menu. (defun ps-add-printer (service) (let ((name (zeroconf-service-name service)) (text (zeroconf-service-txt service)) @@ -267,7 +267,7 @@ ;; `text' is an array of key=value strings like ("Duplex=T" "Copies=T"). (dolist (string text) (let ((split (split-string string "=" t))) - ;; If it is a Postscript printer, there must be a string like + ;; If it is a PostScript printer, there must be a string like ;; "pdl=application/postscript,application/vnd.hp-PCL,...". (when (and (string-equal "pdl" (car split)) (string-match "application/postscript" (cadr split))) @@ -288,7 +288,7 @@ "-H" (format "%s:%s" addr port)))) (pr-update-menus t)))) -;; Remove a printer from the "Postscript printer" menu. +;; Remove a printer from the "PostScript printer" menu. (defun ps-remove-printer (service) (setq pr-ps-printer-alist (delete (assoc (intern (zeroconf-service-name service)) diff --git a/lisp/rot13.el b/lisp/rot13.el index 89b687efdc6..d4885395900 100644 --- a/lisp/rot13.el +++ b/lisp/rot13.el @@ -32,7 +32,7 @@ ;; This hack is mainly to show off the char table stuff. ;; ;; New entry points, `rot13', `rot13-string', and `rot13-region' that -;; performs Ceasar cipher encrypt/decrypt on buffers and strings, was +;; performs Caesar cipher encrypt/decrypt on buffers and strings, was ;; added by Simon Josefsson. ;;; Code: diff --git a/lisp/ses.el b/lisp/ses.el index 9b2048eae83..c71c603726c 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -43,7 +43,7 @@ ;; working fine in most cases, however failed in some cases of several path ;; racing together. ;; -;; The current algorithm is based on Dijksta algorithm. The ``cycle length'' is +;; The current algorithm is based on Dijkstra's algorithm. The cycle length is ;; stored in some cell property. In order not to reset in all cells such ;; property at each update, the cycle length is stored in this property along ;; with some update attempt id that is incremented at each update. The current @@ -980,7 +980,7 @@ if the cell's value is unchanged and FORCE is nil." (error "Circular references: %s" ses--deferred-recalc)) (message " ")) ;; Can't use save-excursion here: if the cell under point is updated, - ;; save-excusion's marker will move past the cell. + ;; save-excursion's marker will move past the cell. (goto-char pos))) @@ -3204,7 +3204,7 @@ By passing in REST some flags one can configure the way the range is read and how it is formatted. In the sequel we assume that cells A1, B1, A2 B2 have respective values -1 2 3 and 4 for examplication. +1 2 3 and 4. Readout direction is specified by a `>v', '`>^', `<v', `<^', `v>', `v<', `^>', `^<' flag. For historical reasons, in absence @@ -3230,7 +3230,7 @@ vector or a matrix depending on the number of rows, `*1' will flatten the result to a one row vector, and `*2' will make a matrix whatever the number of rows. -Warning: interaction with Calc is expermimental and may produce +Warning: interaction with Calc is experimental and may produce confusing results if you are not aware of Calc data format. Use `math-format-value' as a printer for Calc objects." (let (result-row diff --git a/lisp/shell.el b/lisp/shell.el index c75594ddbe4..31c5729b83a 100644 --- a/lisp/shell.el +++ b/lisp/shell.el @@ -293,7 +293,7 @@ Value is a list of strings, which may be nil." (getenv "ESHELL") shell-file-name)) (name (file-name-nondirectory prog))) ;; Tell bash not to use readline, except for bash 1.x which - ;; doesn't grook --noediting. Bash 1.x has -nolineediting, but + ;; doesn't grok --noediting. Bash 1.x has -nolineediting, but ;; process-send-eof cannot terminate bash if we use it. (if (and (not purify-flag) (equal name "bash") diff --git a/lisp/simple.el b/lisp/simple.el index 90d22c817b0..e70d37588a0 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -878,6 +878,7 @@ KILLFLAG is set if N was explicitly specified." (defun mark-whole-buffer () "Put point at beginning and mark at end of buffer. +If narrowing is in effect, only uses the accessible part of the buffer. You probably should not use this function in Lisp programs; it is usually a mistake for a Lisp function to use any subroutine that uses or sets the mark." @@ -2408,7 +2409,7 @@ and only used if a buffer is displayed." 1)) 1))) ;; Don't use the echo area if the output buffer is - ;; already dispayed in the selected frame. + ;; already displayed in the selected frame. (not (get-buffer-window (current-buffer)))) ;; Echo area (goto-char (point-max)) @@ -2657,7 +2658,7 @@ value passed." Per default, this variable is always set to `t', meaning that a call of `process-file' could potentially change any file on a remote host. When set to `nil', a file handler could optimize -its behaviour with respect to remote file attributes caching. +its behavior with respect to remote file attributes caching. This variable should never be changed by `setq'. Instead of, it shall be set only by let-binding.") @@ -4323,7 +4324,7 @@ lines when the window is horizontally scrolled." (when (> rbot 0) (set-window-vscroll nil (+ vs (min rbot (frame-char-height))) t))) ;; If cursor just entered the bottom scroll margin, move forward, - ;; but also vscroll one line so redisplay wont recenter. + ;; but also vscroll one line so redisplay won't recenter. ((and (> vpos 0) (= py (min (- (window-text-height) scroll-margin 1) (1- vpos)))) diff --git a/lisp/speedbar.el b/lisp/speedbar.el index 3e707ff3832..23a91888c1b 100644 --- a/lisp/speedbar.el +++ b/lisp/speedbar.el @@ -631,8 +631,8 @@ with `.' followed by extensions, followed by full-filenames." (substring (car extlist) 1))) (setq regex2 (concat regex2 (if regex2 "\\|" "") (car extlist)))) (setq extlist (cdr extlist))) - ;; concat all the sub-exressions together, making sure all types - ;; of parts exist during concatination. + ;; Concatenate all the subexpressions together, making sure all types + ;; of parts exist during concatenation. (concat "\\(" (if regex1 (concat "\\(\\.\\(" regex1 "\\)\\)") "") (if (and regex1 regex2) "\\|" "") @@ -2100,12 +2100,12 @@ cell of the form ( 'DIRLIST . 'FILELIST )." (if (= index 0) ;; If the shown files variable has extra directories, then ;; it is our responsibility to redraw them all - ;; Luckilly, the nature of inserting items into this list means + ;; Luckily, the nature of inserting items into this list means ;; that by reversing it, we can easilly go in the right order (let ((sf (cdr (reverse speedbar-shown-directories)))) (setq speedbar-shown-directories (list (expand-file-name default-directory))) - ;; exand them all as we find them + ;; Expand them all as we find them. (while sf (if (speedbar-goto-this-file (car sf)) (progn @@ -2219,7 +2219,7 @@ passes some tests." ;; Go through all our bins Stick singles into our ;; junk-list, everything else as sublsts in work-list. ;; If two neighboring lists are both small, make a grouped - ;; group combinding those two sub-lists. + ;; group combining those two sub-lists. (setq diff-idx 0) (while (> 256 diff-idx) ;; The bins contents are currently in forward order. @@ -3292,7 +3292,7 @@ With universal argument ARG, flush cached data." Optional argument ARG indicates that any cache should be flushed." (interactive "P") (speedbar-expand-line arg) - ;; Now, inside the area expaded here, expand all subnodes of + ;; Now, inside the area expanded here, expand all subnodes of ;; the same descendant type. (save-excursion (speedbar-next 1) ;; Move into the list. @@ -3327,7 +3327,7 @@ current indentation level." (speedbar-find-file-in-frame (concat cdd text)) (speedbar-stealthy-updates) (run-hooks 'speedbar-visiting-file-hook) - ;; Reset the timer with a new timeout when cliking a file + ;; Reset the timer with a new timeout when clicking a file ;; in case the user was navigating directories, we can cancel ;; that other timer. (speedbar-set-timer dframe-update-speed)) @@ -3447,7 +3447,7 @@ INDENT is the current indentation level." (select-frame f)) (speedbar-find-file-in-frame file) (save-excursion (speedbar-stealthy-updates)) - ;; Reset the timer with a new timeout when cliking a file + ;; Reset the timer with a new timeout when clicking a file ;; in case the user was navigating directories, we can cancel ;; that other timer. (speedbar-set-timer dframe-update-speed) diff --git a/lisp/startup.el b/lisp/startup.el index 842548577c5..877ba1987f6 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1132,7 +1132,7 @@ the `--debug-init' option to view a complete error backtrace." (eq orig-enable-multibyte (default-value 'enable-multibyte-characters))) ;; Init file changed to unibyte. Reset existing multibyte - ;; buffers (probably *scratch*, *Messages*, *Minibuff-0*). + ;; buffers (probably *scratch*, *Messages*, *Minibuf-0*). ;; Arguably this should only be done if they're free of ;; multibyte characters. (mapc (lambda (buffer) diff --git a/lisp/subr.el b/lisp/subr.el index d5120826812..1cd6598eeb5 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1797,30 +1797,29 @@ This function makes or adds to an entry on `after-load-alist'." (push elt after-load-alist)) ;; Make sure `form' is evalled in the current lexical/dynamic code. (setq form `(funcall ',(eval `(lambda () ,form) lexical-binding))) - (when (symbolp regexp-or-feature) - ;; For features, the after-load-alist elements get run when `provide' is - ;; called rather than at the end of the file. So add an indirection to - ;; make sure that `form' is really run "after-load" in case the provide - ;; call happens early. - (setq form - `(when load-file-name - (let ((fun (make-symbol "eval-after-load-helper"))) - (fset fun `(lambda (file) - (if (not (equal file ',load-file-name)) - nil - (remove-hook 'after-load-functions ',fun) - ,',form))) - (add-hook 'after-load-functions fun))))) - ;; Add FORM to the element unless it's already there. - (unless (member form (cdr elt)) - (nconc elt (purecopy (list form)))) - ;; Is there an already loaded file whose name (or `provide' name) ;; matches FILE? - (if (if (stringp file) - (load-history-filename-element regexp-or-feature) - (featurep file)) - (eval form)))) + (prog1 (if (if (stringp file) + (load-history-filename-element regexp-or-feature) + (featurep file)) + (eval form)) + (when (symbolp regexp-or-feature) + ;; For features, the after-load-alist elements get run when `provide' is + ;; called rather than at the end of the file. So add an indirection to + ;; make sure that `form' is really run "after-load" in case the provide + ;; call happens early. + (setq form + `(when load-file-name + (let ((fun (make-symbol "eval-after-load-helper"))) + (fset fun `(lambda (file) + (if (not (equal file ',load-file-name)) + nil + (remove-hook 'after-load-functions ',fun) + ,',form))) + (add-hook 'after-load-functions fun))))) + ;; Add FORM to the element unless it's already there. + (unless (member form (cdr elt)) + (nconc elt (purecopy (list form))))))) (defvar after-load-functions nil "Special hook run after loading a file. diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el index cfa406c2b48..ff528fcc9df 100644 --- a/lisp/tar-mode.el +++ b/lisp/tar-mode.el @@ -142,7 +142,7 @@ This information is useful, but it takes screen space away from file names." ;; The Tar data is made up of bytes and better manipulated as bytes ;; and can be very large, so insert/delete can be costly. The summary we -;; want to display may contain non-ascci chars, of course, so we'd like it +;; want to display may contain non-ascii chars, of course, so we'd like it ;; to be multibyte. We used to keep both in the same buffer and switch ;; from/to uni/multibyte. But this had several downsides: ;; - set-buffer-multibyte has an O(N^2) worst case that tends to be triggered diff --git a/lisp/term.el b/lisp/term.el index 361ff685396..e1638aecc76 100644 --- a/lisp/term.el +++ b/lisp/term.el @@ -294,7 +294,7 @@ ;; # Notice that the ^[ character is an ESC, not two chars. You can ;; # get it in various ways, for example by typing ;; # echo -e '\033' > escape.file -;; # or by using your favourite editor +;; # or by using your favorite editor ;; ;; foreach temp (cd pushd) ;; alias $temp "$temp \!* ; echo 'AnSiTc' $cwd_hack" @@ -4249,7 +4249,7 @@ special identifiers such as COM1." "History of serial ports used by `serial-read-name'.") (defvar serial-speed-history - ;; Initialised with reasonable values for newbies. + ;; Initialized with reasonable values for newbies. (list "9600" ;; Given twice because 9600 b/s is the most common speed "1200" "2400" "4800" "9600" "14400" "19200" "28800" "38400" "57600" "115200") diff --git a/lisp/term/internal.el b/lisp/term/internal.el index 43b799df1c9..a43864e36d6 100644 --- a/lisp/term/internal.el +++ b/lisp/term/internal.el @@ -68,7 +68,7 @@ ;; MULE charset, Emacs can display a single MULE charset with the ;; glyphs of the current codepage. When Emacs starts on DOS, it ;; automatically sets its default coding systems for file I/O and -;; terminal output according to the currend DOS codepage, given by +;; terminal output according to the current DOS codepage, given by ;; the `dos-codepage' variable. ;; ;; This leaves us with the problem of displaying character sets diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el index 646b65abc60..db826f1db8a 100644 --- a/lisp/term/ns-win.el +++ b/lisp/term/ns-win.el @@ -513,9 +513,6 @@ unless the current buffer is a scratch buffer." ;;;; Frame-related functions. -;; Don't show the frame name; that's redundant with Nextstep. -(setq-default mode-line-frame-identification '(" ")) - ;; nsterm.m (defvar ns-alternate-modifier) (defvar ns-right-alternate-modifier) diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el index 4cb88f6bd23..284c164150d 100644 --- a/lisp/term/pc-win.el +++ b/lisp/term/pc-win.el @@ -134,7 +134,7 @@ ;; terminal-initialization function. Also, our handling of reverse ;; video is slightly different. (defun msdos-create-frame-with-faces (&optional parameters) - "Create an frame on MS-DOS display. + "Create a frame on MS-DOS display. Optional frame parameters PARAMETERS specify the frame parameters. Parameters not specified by PARAMETERS are taken from `default-frame-alist'. If either PARAMETERS or `default-frame-alist' diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el index 0e9de519c8c..5b21913c32e 100644 --- a/lisp/term/rxvt.el +++ b/lisp/term/rxvt.el @@ -118,7 +118,7 @@ ;; function keys F11->F42 from the termcap/terminfo information. On ;; a PC-style keyboard these keys correspond to ;; MODIFIER-FUNCTION_KEY, where modifier is S-, C-, C-S-. The - ;; code here subsitutes the corresponding defintions in + ;; code here subsitutes the corresponding definitions in ;; function-key-map. This substitution is needed because if a key ;; definition if found in function-key-map, there are no further ;; lookups in other keymaps. diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index e3c42626a3f..05e18ed24a0 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -1226,7 +1226,7 @@ The value nil is the same as the list (UTF8_STRING COMPOUND_TEXT STRING)." (if (string= clip-text "") (setq clip-text nil)) ;; Check the CLIPBOARD selection for 'newness', is it different - ;; from what we remebered them to be last time we did a + ;; from what we remembered them to be last time we did a ;; cut/paste operation. (setq clip-text (cond ;; check clipboard @@ -1243,7 +1243,7 @@ The value nil is the same as the list (UTF8_STRING COMPOUND_TEXT STRING)." (when x-select-enable-primary (setq primary-text (x-selection-value-internal 'PRIMARY)) ;; Check the PRIMARY selection for 'newness', is it different - ;; from what we remebered them to be last time we did a + ;; from what we remembered them to be last time we did a ;; cut/paste operation. (setq primary-text (cond ;; check primary selection diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el index 2325d7b26ff..d13437f4c7c 100644 --- a/lisp/textmodes/artist.el +++ b/lisp/textmodes/artist.el @@ -2263,7 +2263,7 @@ Returns a DIRECTION, a number 0--7, coded as follows: ;; Things for drawing lines in all directions. -;; The line drawing engine is the eight-point alrogithm. +;; The line drawing engine is the eight-point algorithm. ;; ;; A line is here a list of (x y saved-char new-char)s. ;; @@ -2437,7 +2437,7 @@ in the coord." point-list)) ;; artist-save-chars-under-point-list -;; Remebers the chars that were there before we did draw the line. +;; Remembers the chars that were there before we did draw the line. ;; Returns point-list. ;; (defun artist-save-chars-under-point-list (point-list) @@ -2514,7 +2514,7 @@ This function returns a point-list." ;; -;; functions for accessing endoints and elements in object requiring +;; functions for accessing endpoints and elements in object requiring ;; 2 endpoints ;; @@ -3582,7 +3582,7 @@ FILL-INFO is a list of vectors on the form [X Y ELLIPSE-WIDTH-ON-THIS-LINE]." (width (abs (- x2 x1))) (height (abs (- y2 y1))) ;; When drawing our circle, we want it to through the cursor - ;; just as when drawing the ellispe, but we have to take + ;; just as when drawing the ellipse, but we have to take ;; care for the aspect-ratio. ;; The equation for the ellipse (where a is the x-radius and ;; b is the y-radius): diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 741b6cd904c..4459ac10098 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el @@ -3941,7 +3941,7 @@ If `bibtex-files' is non-nil, search all these files. Otherwise the search is limited to the current buffer. Return position of entry if CROSSREF-KEY is found or nil otherwise. If CROSSREF-KEY is in the same buffer like current entry but before it -an error is signaled. If NOERRER is non-nil this error is suppressed. +an error is signaled. If NOERROR is non-nil this error is suppressed. Optional arg PNT is the position of the referencing entry. It defaults to position of point. If optional arg SPLIT is non-nil, split window so that both the referencing and the crossrefed entry are displayed. diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 4e6c8bd6b05..5cc5ba45e13 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -417,7 +417,7 @@ See also `conf-space-mode', `conf-colon-mode', `conf-javaprop-mode', (run-mode-hooks 'conf-mode-hook))) (defun conf-mode-initialize (comment &optional font-lock) - "Intitializations for sub-modes of conf-mode. + "Initializations for sub-modes of conf-mode. COMMENT initializes `comment-start' and `comment-start-skip'. The optional arg FONT-LOCK is the value for FONT-LOCK-KEYWORDS." (set (make-local-variable 'comment-start) comment) diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index a5099311307..d54debcec4c 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -715,7 +715,7 @@ not the very same deplacement command." (remove-hook 'after-change-functions 'flyspell-after-change-function t) (remove-hook 'hack-local-variables-hook (function flyspell-hack-local-variables-hook) t) - ;; we remove all the flyspell hilightings + ;; we remove all the flyspell highlightings (flyspell-delete-all-overlays) ;; we have to erase pre cache variables (setq flyspell-pre-buffer nil) @@ -1446,7 +1446,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'." ;; is used, string is a TeX command ;; (char before beginning of word is ;; backslash) and none of the previous - ;; contitions match + ;; conditions match. (and (not ispell-really-aspell) (save-excursion (goto-char (- (nth 1 found-list) 1)) diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el index 62f899d1730..704fad4fb3b 100644 --- a/lisp/textmodes/ispell.el +++ b/lisp/textmodes/ispell.el @@ -2284,7 +2284,7 @@ Otherwise the variable `ispell-grep-command' contains the command used to search for the words (usually egrep). Optional second argument contains the dictionary to use; the default is -`ispell-alternate-dictionary', overriden by `ispell-complete-word-dict' +`ispell-alternate-dictionary', overridden by `ispell-complete-word-dict' if defined." ;; We don't use the filter for this function, rather the result is written ;; into a buffer. Hence there is no need to save the filter values. @@ -2783,7 +2783,7 @@ By just answering RET you can find out what the current dictionary is." (mapcar 'list (ispell-valid-dictionary-list))) nil t) current-prefix-arg)) - (ispell-set-spellchecker-params) ; Initilize variables and dicts alists + (ispell-set-spellchecker-params) ; Initialize variables and dicts alists (unless arg (ispell-buffer-local-dict 'no-reload)) (if (equal dict "default") (setq dict nil)) ;; This relies on completing-read's bug of returning "" for no match @@ -3503,7 +3503,7 @@ Don't read buffer-local settings or word lists." '( ;; Don't spell check signatures "^-- $" - ;; Matches postscript files. + ;; Matches PostScript files. ;;"^%!PS-Adobe-[123].0" ;; Matches uuencoded text ;;"^begin [0-9][0-9][0-9] .*\nM.*\nM.*\nM" diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el index 6e73fda662b..91f6624e7a3 100644 --- a/lisp/textmodes/page-ext.el +++ b/lisp/textmodes/page-ext.el @@ -435,7 +435,7 @@ REVERSE (non-nil means reverse order), BEG and END (region to sort)." (skip-chars-forward " \t\n") )) - ;; ENDRECFUN is is called with point within the record. + ;; ENDRECFUN is called with point within the record. ;; It should move point to the end of the record. (function (lambda () (if (re-search-forward diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el index 9b924ba7ad9..7de15c66cec 100644 --- a/lisp/textmodes/reftex-dcr.el +++ b/lisp/textmodes/reftex-dcr.el @@ -59,7 +59,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (error "Not on a crossref macro argument")) (setq reftex-call-back-to-this-buffer (current-buffer)) - + (cond ((string-match "\\`\\\\cite\\|cite\\*?\\'\\|bibentry" macro) ;; A citation macro: search for bibitems or BibTeX entries @@ -87,7 +87,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (format reftex-find-index-entry-regexp-format (regexp-quote key)) 3 nil nil))) - (t + (t (reftex-access-scan-info arg) (catch 'exit (let ((list reftex-view-crossref-extra) @@ -97,14 +97,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." action (nth 1 entry) group (nth 2 entry)) (when (string-match mre macro) - (setq dw (reftex-view-regexp-match + (setq dw (reftex-view-regexp-match (format action key) group nil nil)) (throw 'exit t)))) (error "Not on a crossref macro argument")))) (if (and (eq arg 2) (windowp dw)) (select-window dw))))) - + (defun reftex-view-cr-cite (arg key how) - ;; View crossreference of a ref cite. HOW can have the values + ;; View crossreference of a ref cite. HOW can have the values ;; nil: Show in another window. ;; echo: Show one-line info in echo area. ;; tmp-window: Show in small window and arrange for window to disappear. @@ -114,7 +114,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (if (eq how 'tmp-window) ;; Remember the window configuration - (put 'reftex-auto-view-crossref 'last-window-conf + (put 'reftex-auto-view-crossref 'last-window-conf (current-window-configuration))) (let (files size item (pos (point)) (win (selected-window)) pop-win @@ -130,7 +130,7 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (setq item t files (reftex-uniquify (mapcar 'cdr - (reftex-all-assq + (reftex-all-assq 'thebib (symbol-value reftex-docstruct-symbol)))))) (reftex-default-bibliography (setq item nil @@ -169,17 +169,17 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." (select-window pop-win))))) (defun reftex-view-cr-ref (arg label how) - ;; View crossreference of a ref macro. HOW can have the values + ;; View crossreference of a ref macro. HOW can have the values ;; nil: Show in another window. ;; echo: Show one-line info in echo area. ;; tmp-window: Show in small window and arrange for window to disappear. ;; Ensure access to scanning info (reftex-access-scan-info (or arg current-prefix-arg)) - + (if (eq how 'tmp-window) ;; Remember the window configuration - (put 'reftex-auto-view-crossref 'last-window-conf + (put 'reftex-auto-view-crossref 'last-window-conf (current-window-configuration))) (let* ((xr-data (assoc 'xr (symbol-value reftex-docstruct-symbol))) @@ -191,14 +191,14 @@ to the functions `reftex-view-cr-cite' and `reftex-view-cr-ref'." ;; Label is defined in external document (save-excursion (save-match-data - (set-buffer + (set-buffer (or (reftex-get-file-buffer-force (cdr (assoc (match-string 1 label) (nth 1 xr-data)))) (error "Problem with external label %s" label)))) (setq label (substring label (match-end 1))) (reftex-access-scan-info) - (setq entry + (setq entry (assoc label (symbol-value reftex-docstruct-symbol))))) (if (eq how 'echo) ;; Display in echo area @@ -234,7 +234,7 @@ With argument, actually select the window showing the cross reference." (defun reftex-view-crossref-when-idle () ;; Display info about crossref at point in echo area or a window. - ;; This function was desigend to work with an idle timer. + ;; This function was designed to work with an idle timer. ;; We try to get out of here as quickly as possible if the call is useless. (and reftex-mode ;; Make sure message area is free if we need it. @@ -244,7 +244,7 @@ With argument, actually select the window showing the cross reference." reftex-mouse-view-crossref))) ;; Quick precheck if this might be a relevant spot ;; `reftex-view-crossref' will do a more thorough check. - (save-excursion + (save-excursion (search-backward "\\" nil t) (looking-at "\\\\[a-zA-Z]*\\(cite\\|ref\\|bibentry\\)")) @@ -262,12 +262,12 @@ With argument, actually select the window showing the cross reference." (set-window-configuration (get 'reftex-auto-view-crossref 'last-window-conf)) (put 'reftex-auto-view-crossref 'last-window-conf nil) (remove-hook 'pre-command-hook 'reftex-restore-window-conf)) - + (defun reftex-echo-ref (label entry docstruct) ;; Display crossref info in echo area. (cond ((null docstruct) - (message "%s" + (message "%s" (substitute-command-keys (format reftex-no-info-message "ref")))) ((null entry) (message "ref: unknown label: %s" label)) @@ -293,14 +293,14 @@ With argument, actually select the window showing the cross reference." (unless reftex-revisit-to-echo (setq files (reftex-visited-files files))) - (setq entry + (setq entry (condition-case nil (save-excursion (reftex-pop-to-bibtex-entry key files nil nil item t)) (error (if (and files (= (length all-files) (length files))) (message "cite: no such database entry: %s" key) - (message "%s" (substitute-command-keys + (message "%s" (substitute-command-keys (format reftex-no-info-message "cite")))) nil))) (when entry @@ -337,7 +337,7 @@ will display info in the echo area." (if (featurep 'xemacs) (if reftex-use-itimer-in-xemacs (start-itimer "RefTeX Idle Timer" - 'reftex-view-crossref-when-idle + 'reftex-view-crossref-when-idle reftex-idle-time reftex-idle-time t) (add-hook 'post-command-hook 'reftex-start-itimer-once) t) @@ -352,7 +352,7 @@ will display info in the echo area." (not (itimer-live-p reftex-auto-view-crossref-timer)) (setq reftex-auto-view-crossref-timer (start-itimer "RefTeX Idle Timer" - 'reftex-view-crossref-when-idle + 'reftex-view-crossref-when-idle reftex-idle-time nil t)))) (declare-function bibtex-beginning-of-entry "bibtex" ()) @@ -364,7 +364,7 @@ prompts upon first use for a buffer in RefTeX mode. To reset this link to a document, call the function with with a prefix arg. Calling this function several times find successive citation locations." (interactive "P") - (when arg + (when arg ;; Break connection to reference buffer (put 'reftex-bibtex-view-cite-locations :ref-buffer nil)) (let ((ref-buffer (get 'reftex-bibtex-view-cite-locations :ref-buffer))) @@ -372,10 +372,10 @@ Calling this function several times find successive citation locations." (unless ref-buffer (setq ref-buffer (save-current-buffer - (completing-read + (completing-read "Reference buffer: " (delq nil - (mapcar + (mapcar (lambda (b) (set-buffer b) (if reftex-mode (list (buffer-name b)) nil)) diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el index ccdab49750b..bf46635c479 100644 --- a/lisp/textmodes/reftex-global.el +++ b/lisp/textmodes/reftex-global.el @@ -139,7 +139,7 @@ No active TAGS table is required." (set (make-local-variable 'TeX-master) master) (erase-buffer) (insert " MULTIPLE LABELS IN CURRENT DOCUMENT:\n") - (insert + (insert " Move point to label and type `r' to run a query-replace on the label\n" " and its references. Type `q' to exit this buffer.\n\n") (insert " LABEL FILE\n") @@ -190,15 +190,15 @@ This command should be used with care, in particular in multifile documents. You should not use it if another document refers to this one with the `xr' package." (interactive) - ;; Resan the entire document + ;; Rescan the entire document (reftex-access-scan-info 1) ;; Get some insurance (if (and (reftex-is-multi) (not (yes-or-no-p "Replacing all simple labels in multiple files is risky. Continue? "))) (error "Abort")) ;; Make the translation list - (let* ((re-core (concat "\\(" - (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") + (let* ((re-core (concat "\\(" + (mapconcat 'cdr reftex-typekey-to-prefix-alist "\\|") "\\)")) (label-re (concat "\\`" re-core "\\([0-9]+\\)\\'")) (search-re (concat "[{,]\\(" re-core "\\([0-9]+\\)\\)[,}]")) @@ -230,12 +230,12 @@ one with the `xr' package." ;; Save all document buffers before this operation (reftex-save-all-document-buffers) - ;; First test to check for erros - (setq n (reftex-translate + ;; First test to check for errors. + (setq n (reftex-translate files search-re translate-alist error-fmt 'test)) ;; Now the real thing. - (if (yes-or-no-p + (if (yes-or-no-p (format "Replace %d items at %d places in %d files? " (length translate-alist) n (length files))) (progn @@ -253,9 +253,9 @@ one with the `xr' package." (defun reftex-translate (files search-re translate-alist error-fmt test) ;; In FILES, look for SEARCH-RE and replace match 1 of it with - ;; its association in TRANSLATE-ALSIT. + ;; its association in TRANSLATE-ALIST. ;; If we do not find an association and TEST is non-nil, query - ;; to ignore the problematic string. + ;; to ignore the problematic string. ;; If TEST is nil, it is ignored without query. ;; Return the number of replacements. (let ((n 0) file label match-data buf macro pos cell) @@ -281,7 +281,7 @@ one with the `xr' package." (or (looking-at "\\\\ref") (looking-at "\\\\[a-zA-Z]*ref\\(range\\)?[^a-zA-Z]") (looking-at "\\\\ref[a-zA-Z]*[^a-zA-Z]") - (looking-at (format + (looking-at (format reftex-find-label-regexp-format (regexp-quote label))))) ;; OK, we should replace it. @@ -351,7 +351,7 @@ Also checks if buffers visiting the files are in read-only mode." (defun reftex-isearch-wrap-function () (if (not isearch-word) - (switch-to-buffer + (switch-to-buffer (funcall isearch-next-buffer-function (current-buffer) t))) (goto-char (if isearch-forward (point-min) (point-max)))) @@ -435,7 +435,7 @@ With no argument, this command toggles `reftex-isearch-minor-mode' on if ARG is positive, otherwise turn it off." (interactive "P") (let ((old-reftex-isearch-minor-mode reftex-isearch-minor-mode)) - (setq reftex-isearch-minor-mode + (setq reftex-isearch-minor-mode (not (or (and (null arg) reftex-isearch-minor-mode) (<= (prefix-numeric-value arg) 0)))) (unless (eq reftex-isearch-minor-mode old-reftex-isearch-minor-mode) @@ -471,7 +471,7 @@ With no argument, this command toggles ;; Force modeline redisplay. (set-buffer-modified-p (buffer-modified-p)))) -(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil +(add-minor-mode 'reftex-isearch-minor-mode "/I" nil nil 'reftex-isearch-minor-mode) ;;; reftex-global.el ends here diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index 79df6135806..f0ceaa74d26 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -663,7 +663,7 @@ SPC=view TAB=goto RET=goto+hide [e]dit [q]uit [r]escan [f]ollow [?]Help (insert "\n"))) (defun reftex-get-restriction (arg docstruct) - ;; Interprete the prefix ARG and derive index restriction specs. + ;; Interpret the prefix ARG and derive index restriction specs. (let* ((beg (min (point) (or (condition-case nil (mark) (error nil)) (point-max)))) (end (max (point) (or (condition-case nil (mark) (error nil)) diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el index b0f22085064..1a0f7ec5836 100644 --- a/lisp/textmodes/reftex-parse.el +++ b/lisp/textmodes/reftex-parse.el @@ -443,7 +443,7 @@ of master file." (defvar test-dummy) (defun reftex-index-info (file) ;; Return an index entry for the current match. - ;; Carefull: This function expects the match-data to be still in place! + ;; Careful: This function expects the match-data to be still in place! (catch 'exit (let* ((macro (reftex-match-string 10)) (bom (match-beginning 10)) @@ -711,7 +711,7 @@ of master file." context) (when (and (not appendix) (>= (string-to-char (match-string 2)) ?A)) - ;; Just entered the appendex. Get out. + ;; Just entered the appendix. Get out. (throw 'exit nil)) ;; Change the section number. diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el index b47f2f6c2e9..d622603236e 100644 --- a/lisp/textmodes/reftex-ref.el +++ b/lisp/textmodes/reftex-ref.el @@ -206,7 +206,7 @@ This function is controlled by the settings of reftex-insert-label-flags." (if naked "Naked Label: " "Label: ") default)) - ;; Lets make sure that this is a valid label + ;; Let's make sure that this is a valid label (cond ((string-match (concat "\\`\\(" (regexp-quote prefix) diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 37983d17931..25be64a3af2 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -33,7 +33,7 @@ (defvar reftex-toc-mode-map (let ((map (make-sparse-keymap))) - + (define-key map (if (featurep 'xemacs) [(button2)] [(mouse-2)]) 'reftex-toc-mouse-goto-line-and-hide) (define-key map [follow-link] 'mouse-face) @@ -170,15 +170,15 @@ Here are all local bindings. (defvar reftex-toc-return-marker (make-marker) - "Marker which makes it possible to return from toc to old position.") + "Marker which makes it possible to return from TOC to old position.") (defconst reftex-toc-help " AVAILABLE KEYS IN TOC BUFFER ============================ n / p next-line / previous-line SPC Show the corresponding location of the LaTeX document. -TAB Goto the location and keep the *toc* window. -RET Goto the location and hide the *toc* window (also on mouse-2). +TAB Goto the location and keep the TOC window. +RET Goto the location and hide the TOC window (also on mouse-2). < / > Promote / Demote section, or all sections in region. C-c > Display Index. With prefix arg, restrict index to current section. q / k Hide/Kill *toc* buffer, return to position of reftex-toc command. @@ -287,7 +287,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help (setq offset (reftex-insert-docstruct this-buf - t ; include toc + t ; include TOC reftex-toc-include-labels reftex-toc-include-index-entries reftex-toc-include-file-boundaries @@ -296,7 +296,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help nil ; commented here-I-am "" ; xr-prefix - t ; a toc buffer + t ; a TOC buffer )) (run-hooks 'reftex-display-copied-context-hook) @@ -391,7 +391,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help (frame-parameter frame 'name)) "RefTeX TOC Frame"))) (if (and res error) - (error "This frame is view-only. Use `C-c =' to create toc window for commands")) + (error "This frame is view-only. Use `C-c =' to create TOC window for commands")) res)) (defun reftex-toc-show-help () @@ -421,14 +421,14 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help (goto-char (or (previous-single-property-change (point) :data) (point)))) (defun reftex-toc-next-heading (&optional arg) - "Move to next table of contentes line." + "Move to next table of contents line." (interactive "p") (when (featurep 'xemacs) (setq zmacs-region-stays t)) (end-of-line) (re-search-forward "^ " nil t arg) (beginning-of-line)) (defun reftex-toc-previous-heading (&optional arg) - "Move to previous table of contentes line." + "Move to previous table of contents line." (interactive "p") (when (featurep 'xemacs) (setq zmacs-region-stays t)) (re-search-backward "^ " nil t arg)) @@ -468,9 +468,9 @@ Label context is only displayed when the labels are there as well." (setq reftex-toc-include-context (not reftex-toc-include-context)) (reftex-toc-revert)) (defun reftex-toc-max-level (arg) - "Set the maximum level of toc lines in this buffer to value of prefix ARG. + "Set the maximum level of TOC lines in this buffer to value of prefix ARG. When no prefix is given, set the max level to a large number, so that all -levels are shown. For eaxample, to set the level to 3, type `3 m'." +levels are shown. For example, to set the level to 3, type `3 m'." (interactive "P") (setq reftex-toc-max-level (if arg (prefix-numeric-value arg) @@ -484,23 +484,23 @@ levels are shown. For eaxample, to set the level to 3, type `3 m'." (reftex-toc-dframe-p nil 'error) (reftex-toc-visit-location)) (defun reftex-toc-goto-line-and-hide () - "Go to document location in other window. Hide the *toc* window." + "Go to document location in other window. Hide the TOC window." (interactive) (reftex-toc-dframe-p nil 'error) (reftex-toc-visit-location 'hide)) (defun reftex-toc-goto-line () - "Go to document location in other window. *toc* window stays." + "Go to document location in other window. TOC window stays." (interactive) (reftex-toc-dframe-p nil 'error) (reftex-toc-visit-location t)) (defun reftex-toc-mouse-goto-line-and-hide (ev) - "Go to document location in other window. Hide the *toc* window." + "Go to document location in other window. Hide the TOC window." (interactive "e") (mouse-set-point ev) (reftex-toc-dframe-p nil 'error) (reftex-toc-visit-location 'hide)) (defun reftex-toc-show-calling-point () - "Show point where reftex-toc was called from." + "Show point where `reftex-toc' was called from." (interactive) (reftex-toc-dframe-p nil 'error) (let ((this-window (selected-window))) @@ -512,8 +512,8 @@ levels are shown. For eaxample, to set the level to 3, type `3 m'." (recenter '(4))) (select-window this-window)))) (defun reftex-toc-quit () - "Hide the *toc* window and do not move point. -If the toc window is the only window on the dedicated TOC frame, the frame + "Hide the TOC window and do not move point. +If the TOC window is the only window on the dedicated TOC frame, the frame is destroyed." (interactive) (if (and (one-window-p) @@ -584,7 +584,7 @@ With prefix arg 1, restrict index to the section at point." (reftex-toc))) (defun reftex-toc-revert (&rest ignore) - "Regenerate the *toc* from the internal lists." + "Regenerate the TOC from the internal lists." (interactive) (let ((unsplittable (if (fboundp 'frame-property) @@ -618,7 +618,7 @@ With prefix arg 1, restrict index to the section at point." (defun reftex-toc-jump (arg) "Jump to a specific section. E.g. '3 z' jumps to section 3. -Useful for large TOC's." +Useful for large TOCs." (interactive "P") (goto-char (point-min)) (re-search-forward @@ -642,7 +642,7 @@ Useful for large TOC's." (interactive "p") (reftex-toc-do-promote -1)) (defun reftex-toc-do-promote (delta) - "Workhorse for reftex-toc-promote and reftex-to-demote. + "Workhorse for `reftex-toc-promote' and `reftex-toc-demote'. Changes the level of sections in the current region, or just the section at point." ;; We should not do anything unless we are sure this is going to work for @@ -660,7 +660,7 @@ point." (setq msg (catch 'exit (if (reftex-region-active-p) - ;; A region is dangerous, check if we have a brandnew scan, + ;; A region is dangerous, check if we have a brand new scan, ;; to make sure we are not missing any section statements. (if (not (reftex-toc-check-docstruct)) (reftex-toc-load-all-files-for-promotion) ;; exits @@ -728,8 +728,8 @@ point." deactivate-mark nil))))) (defun reftex-toc-promote-prepare (x delta) - "Look at a toc entry and see if we could pro/demote it. -This function prepares everything for the changes, but does not do it. + "Look at a TOC entry and see if we could pro/demote it. +This function prepares everything for the change, but does not do it. The return value is a list with information needed when doing the promotion/demotion later. DELTA is the level change." (let* ((data (car x)) @@ -779,7 +779,7 @@ promotion/demotion later. DELTA is the level change." (error "Cannot %smote \\%s" pro-or-de name)))) (defun reftex-toc-promote-action (x) - "Change the level of a toc entry. + "Change the level of a TOC entry. PRO-OR-DE is assumed to be dynamically scoped into this function." (let* ((data (car x)) (name (nth 1 x)) @@ -792,7 +792,7 @@ PRO-OR-DE is assumed to be dynamically scoped into this function." (error "Fatal error during %smotion" pro-or-de))))) (defun reftex-toc-extract-section-number (entry) - "Get the numbering of a toc entry, for message purposes." + "Get the numbering of a TOC entry, for message purposes." (if (string-match "\\s-*\\(\\S-+\\)" (nth 2 (car entry))) (match-string 1 (nth 2 (car entry))) "?")) @@ -838,7 +838,7 @@ if these sets are sorted blocks in the alist." (defun reftex-toc-load-all-files-for-promotion () "Make sure all files of the document are being visited by buffers, and that the scanning info is absolutely up to date. -We do this by rescanning with reftex-keep-temporary-buffers bound to t. +We do this by rescanning with `reftex-keep-temporary-buffers' bound to t. The variable PRO-OR-DE is assumed to be dynamically scoped into this function. When finished, we exit with an error message." (let ((reftex-keep-temporary-buffers t)) @@ -848,9 +848,9 @@ When finished, we exit with an error message." "TOC had to be updated first. Please check selection and repeat the command."))) (defun reftex-toc-rename-label () - "Rename the currently selected label in the *TOC* buffer. + "Rename the currently selected label in the *toc* buffer. This launches a global search and replace in order to rename a label. -Renaming a label is hardly ever necessary - the only exeption is after +Renaming a label is hardly ever necessary - the only exception is after promotion/demotion in connection with a package like fancyref, where the label prefix determines the wording of a reference." (interactive) @@ -861,7 +861,7 @@ label prefix determines the wording of a reference." (setq newlabel (read-string (format "Rename label \"%s\" to:" label))) (if (assoc newlabel (symbol-value reftex-docstruct-symbol)) (if (not (y-or-n-p - (format "Label '%s' exists. Use anyway? " label))) + (format "Label '%s' exists. Use anyway? " label))) (error "Abort"))) (save-excursion (save-window-excursion @@ -875,10 +875,10 @@ label prefix determines the wording of a reference." (defun reftex-toc-visit-location (&optional final no-revisit) - ;; Visit the tex file corresponding to the toc entry on the current line. + ;; Visit the tex file corresponding to the TOC entry on the current line. ;; If FINAL is t, stay there - ;; If FINAL is 'hide, hide the *toc* window. - ;; Otherwise, move cursor back into *toc* window. + ;; If FINAL is 'hide, hide the TOC window. + ;; Otherwise, move cursor back into TOC window. ;; NO-REVISIT means don't visit files, just use live buffers. ;; This function is pretty clever about finding back a section heading, ;; even if the buffer is not live, or things like outline, x-symbol etc. @@ -888,7 +888,7 @@ label prefix determines the wording of a reference." (toc-window (selected-window)) show-window show-buffer match) - (unless toc (error "Don't know which toc line to visit")) + (unless toc (error "Don't know which TOC line to visit")) (cond @@ -1012,8 +1012,8 @@ label prefix determines the wording of a reference." (reftex-toc-recenter)))) (defun reftex-toggle-auto-toc-recenter () - "Toggle the automatic recentering of the toc window. -When active, leaving point idle will make the toc window jump to the correct + "Toggle the automatic recentering of the TOC window. +When active, leaving point idle will make the TOC window jump to the correct section." (interactive) (if reftex-toc-auto-recenter-timer @@ -1022,7 +1022,7 @@ section." (delete-itimer reftex-toc-auto-recenter-timer) (cancel-timer reftex-toc-auto-recenter-timer)) (setq reftex-toc-auto-recenter-timer nil) - (message "Automatic recentering of toc windwo was turned off")) + (message "Automatic recentering of TOC window was turned off")) (setq reftex-toc-auto-recenter-timer (if (featurep 'xemacs) (start-itimer "RefTeX Idle Timer for recenter" @@ -1030,7 +1030,7 @@ section." reftex-idle-time reftex-idle-time t) (run-with-idle-timer reftex-idle-time t 'reftex-recenter-toc-when-idle))) - (message "Automatic recentering of toc window was turned on"))) + (message "Automatic recentering of TOC window was turned on"))) (defun reftex-toc-toggle-dedicated-frame () "Toggle the display of a separate frame for the TOC. @@ -1052,7 +1052,7 @@ always show the current section in connection with the option (reftex-make-separate-toc-frame)))) (defun reftex-make-separate-toc-frame () - ;; Create a new fame showing only the toc buffer. + ;; Create a new fame showing only the TOC buffer. (let ((current-frame (selected-frame)) (current-window (selected-window)) (current-toc-window (get-buffer-window "*toc*" 'visible)) diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el index cef8a3d1548..b73056a803b 100644 --- a/lisp/textmodes/reftex.el +++ b/lisp/textmodes/reftex.el @@ -42,7 +42,7 @@ ;; - For XEmacs 21.x, you need to install the RefTeX plug-in package ;; available from the XEmacs distribution sites. ;; - If you have downloaded this file from the maintainers webpage, follow -;; the instructions in the INSTALL file of the distrubution. +;; the instructions in the INSTALL file of the distribution. ;; ;; To turn RefTeX Mode on and off in a buffer, use `M-x reftex-mode'. ;; @@ -688,7 +688,7 @@ on the menu bar. (TeX-master-file t) (error (buffer-file-name)))) ((fboundp 'tex-main-file) (tex-main-file)) ; Emacs LaTeX mode - ((boundp 'TeX-master) ; The variable is defined - lets use it. + ((boundp 'TeX-master) ; The variable is defined - let's use it. (cond ((eq TeX-master t) (buffer-file-name)) @@ -1568,7 +1568,7 @@ Valid actions are: readable, restore, read, kill, write." ;;; Finding files (defun reftex-locate-file (file type master-dir &optional die) - "Find FILE of type TYPE in MASTER-DIR or on the path associcted with TYPE. + "Find FILE of type TYPE in MASTER-DIR or on the path associated with TYPE. If the file does not have any of the valid extensions for TYPE, try first the default extension and only then the naked file name. When DIE is non-nil, throw an error if file not found." @@ -1612,7 +1612,7 @@ When DIE is non-nil, throw an error if file not found." (defun reftex-find-file-externally (file type &optional master-dir) ;; Use external program to find FILE. ;; The program is taken from `reftex-external-file-finders'. - ;; Interprete relative path definitions starting from MASTER-DIR. + ;; Interpret relative path definitions starting from MASTER-DIR. (let ((default-directory (or master-dir default-directory)) (prg (cdr (assoc type reftex-external-file-finders))) out) @@ -2058,7 +2058,7 @@ When DIE is non-nil, throw an error if file not found." (with-current-buffer buf (run-hooks 'reftex-initialize-temporary-buffers)))) - ;; Lets see if we got a license to kill :-| + ;; Let's see if we got a license to kill :-| (and mark-to-kill (add-to-list 'reftex-buffers-to-kill buf)) @@ -2254,7 +2254,7 @@ IGNORE-WORDS List of words which should be removed from the string." (defvar font-lock-defaults-computed) (defun reftex-fontify-select-label-buffer (parent-buffer) ;; Fontify the `*RefTeX Select*' buffer. Buffer is temporarily renamed to - ;; start with none-SPC char, beacuse Font-Lock otherwise refuses operation. + ;; start with none-SPC char, because Font-Lock otherwise refuses operation. (run-hook-with-args 'reftex-pre-refontification-functions parent-buffer 'reftex-ref) (let* ((oldname (buffer-name)) diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el index 1923ab692d8..07a4fae9c30 100644 --- a/lisp/textmodes/remember.el +++ b/lisp/textmodes/remember.el @@ -113,7 +113,7 @@ ;; - Allowing particular views of the initially amorphous data pool ;; (ala the Xanadu concept). ;; -;; - Storage of the data in a manner most appopriate to that data, +;; - Storage of the data in a manner most appropriate to that data, ;; such as keeping address-book type information in BBDB, etc. ;; ;; * Using "remember" diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index f9fda7e0a74..81e92487eb0 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -476,8 +476,8 @@ for modes derived from Text mode, like Mail mode." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Section Decoration Adjusment -;; ============================ +;; Section Decoration Adjustment +;; ============================= ;; ;; The following functions implement a smart automatic title sectioning feature. ;; The idea is that with the cursor sitting on a section title, we try to get as @@ -1534,7 +1534,7 @@ is a regular expression for matching the lines with items." (defvar rst-preferred-bullets '(?- ?* ?+) - "List of favourite bullets to set for straightening bullets.") + "List of favorite bullets to set for straightening bullets.") (defun rst-straighten-bullets-region (beg end) "Make all the bulleted list items in the region consistent. @@ -2323,7 +2323,7 @@ of (COLUMN-NUMBER . LINE) pairs." (indent-rigidly mbeg mend - ;; Find the next tab after the leftmost columnt. + ;; Find the next tab after the leftmost column. (let ((tab (funcall find-next-fun tabs leftmostcol))) (if tab @@ -2475,7 +2475,7 @@ first of a paragraph." ;;------------------------------------------------------------------------------ ;; FIXME: these next functions should become part of a larger effort to redo the -;; bullets in bulletted lists. The enumerate would just be one of the possible +;; bullets in bulleted lists. The enumerate would just be one of the possible ;; outputs. ;; ;; FIXME: TODO we need to do the enumeration removal as well. diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el index be8dd9c9130..fa958632799 100644 --- a/lisp/textmodes/sgml-mode.el +++ b/lisp/textmodes/sgml-mode.el @@ -1558,7 +1558,7 @@ LCON is the lexical context, if any." (defun sgml-guess-indent () "Guess an appropriate value for `sgml-basic-offset'. -Base the guessed identation level on the first indented tag in the buffer. +Base the guessed indentation level on the first indented tag in the buffer. Add this to `sgml-mode-hook' for convenience." (interactive) (save-excursion @@ -1872,7 +1872,7 @@ This takes effect when first loading the library.") ("dir" . "Directory list (obsolete)") ("div" . "Generic block-level container") ("dl" . "Definition list") - ("dt" . "Term to be definined") + ("dt" . "Term to be defined") ("em" . "Emphasized") ("embed" . "Embedded data in foreign format") ("fig" . "Figure") @@ -1897,7 +1897,7 @@ This takes effect when first loading the library.") ("input" . "Form input field") ("ins" . "Inserted text") ("isindex" . "Input field for index search") - ("kbd" . "Keybard example face") + ("kbd" . "Keyboard example face") ("lang" . "Natural language") ("li" . "List item") ("link" . "Link relationship") diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el index 2dc4e4a88b1..08922445521 100644 --- a/lisp/textmodes/table.el +++ b/lisp/textmodes/table.el @@ -1482,7 +1482,7 @@ the last cache point coordinate." (cons (cons command func-symbol) table-command-remap-alist)))) '(center-line - conter-region + center-region center-paragraph fill-paragraph)) diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el index deb92fc0243..c4892ce572c 100644 --- a/lisp/textmodes/tex-mode.el +++ b/lisp/textmodes/tex-mode.el @@ -1871,7 +1871,7 @@ Mark is left at original location." tex-old-error-file-name 2 nil 1 1 (2 compilation-warning-face)) ;; Included files get output as (<file> ...). - ;; FIXME: there tend to be a crapload of them at the beginning of the + ;; FIXME: there tend to be a boatload of them at the beginning of the ;; output which aren't that interesting. Maybe we should filter out ;; all the file name that start with /usr/share? ;; ("(\\.?/\\([^() \n]+\\)" 1 nil nil 0) diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index d33cbb97dd8..094885bb0d0 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -620,7 +620,7 @@ if large. You can use `Info-split' to do this manually." "var{\\|" "w{\\|" "xref{\\|" - "@-\\|" ; @- is a descretionary hyphen (not an accent) (a noop). + "@-\\|" ; @- is a discretionary hyphen (not an accent) (a noop). texinfo-accent-commands "\\)" ) @@ -2194,7 +2194,7 @@ This command is executed when texinfmt sees @item inside @multitable." (put 'image 'texinfo-format 'texinfo-format-image) (defun texinfo-format-image () - "Insert an image from an an file ending in .txt. + "Insert an image from a file ending in .txt. Use only the FILENAME arg; for Info, ignore the other arguments to @image." (let ((args (texinfo-format-parse-args)) filename) @@ -3909,11 +3909,11 @@ Default is to leave paragraph indentation as is." ;;; @set, @clear, @ifset, @ifclear ;; If a flag is set with @set FLAG, then text between @ifset and @end -;; ifset is formatted normally, but if the flag is is cleared with +;; ifset is formatted normally, but if the flag is cleared with ;; @clear FLAG, then the text is not formatted; it is ignored. ;; If a flag is cleared with @clear FLAG, then text between @ifclear -;; and @end ifclear is formatted normally, but if the flag is is set with +;; and @end ifclear is formatted normally, but if the flag is set with ;; @set FLAG, then the text is not formatted; it is ignored. @ifclear ;; is the opposite of @ifset. diff --git a/lisp/thumbs.el b/lisp/thumbs.el index 7a505758408..6ac8eddc9d6 100644 --- a/lisp/thumbs.el +++ b/lisp/thumbs.el @@ -26,7 +26,7 @@ ;; This package create two new modes: thumbs-mode and thumbs-view-image-mode. ;; It is used for basic browsing and viewing of images from within Emacs. ;; Minimal image manipulation functions are also available via external -;; programs. If you want to do more complex tasks like categorise and tag +;; programs. If you want to do more complex tasks like categorize and tag ;; your images, use image-dired.el ;; ;; The 'convert' program from 'ImageMagick' diff --git a/lisp/tmm.el b/lisp/tmm.el index 52704e70a55..5722c2c8f79 100644 --- a/lisp/tmm.el +++ b/lisp/tmm.el @@ -37,7 +37,6 @@ ;;; The following will be localized, added only to pacify the compiler. (defvar tmm-short-cuts) (defvar tmm-old-mb-map nil) -(defvar tmm-old-comp-map) (defvar tmm-c-prompt nil) (defvar tmm-km-list) (defvar tmm-next-shortcut-digit) @@ -98,7 +97,7 @@ See the documentation for `tmm-prompt'." (defcustom tmm-mid-prompt "==>" "String to insert between shortcut and menu item. -If nil, there will be no shortcuts. It should not consist only of spaces, +If nil, there will be no shortcuts. It should not consist only of spaces, or else the correct item might not be found in the `*Completions*' buffer." :type 'string :group 'tmm) @@ -158,7 +157,7 @@ Its value should be an event that has a binding in MENU." (let ((gl-str "Menu bar") ;; The menu bar itself is not a menu keymap ; so it doesn't have a name. tmm-km-list out history history-len tmm-table-undef tmm-c-prompt - tmm-old-mb-map tmm-old-comp-map tmm-short-cuts + tmm-old-mb-map tmm-short-cuts chosen-string choice (not-menu (not (keymapp menu)))) (run-hooks 'activate-menubar-hook) @@ -219,23 +218,16 @@ Its value should be an event that has a binding in MENU." (setq history-len (length history)) (setq history (append history history history history)) (setq tmm-c-prompt (nth (- history-len 1 index-of-default) history)) - (add-hook 'minibuffer-setup-hook 'tmm-add-prompt) - (if default-item - (setq out (car (nth index-of-default tmm-km-list))) - (save-excursion - (unwind-protect - (setq out - (completing-read - (concat gl-str - " (up/down to change, PgUp to menu): ") - tmm-km-list nil t nil - (cons 'history - (- (* 2 history-len) index-of-default)))) - (remove-hook 'minibuffer-setup-hook 'tmm-add-prompt) - (if (get-buffer "*Completions*") - (with-current-buffer "*Completions*" - (use-local-map tmm-old-comp-map) - (bury-buffer (current-buffer))))))))) + (setq out + (if default-item + (car (nth index-of-default tmm-km-list)) + (minibuffer-with-setup-hook #'tmm-add-prompt + (completing-read + (concat gl-str + " (up/down to change, PgUp to menu): ") + tmm-km-list nil t nil + (cons 'history + (- (* 2 history-len) index-of-default)))))))) (setq choice (cdr (assoc out tmm-km-list))) (and (null choice) (> (length out) (length tmm-c-prompt)) @@ -270,7 +262,7 @@ Its value should be an event that has a binding in MENU." choice))))) (defun tmm-add-shortcuts (list) - "Adds shortcuts to cars of elements of the list. + "Add shortcuts to cars of elements of the list. Takes a list of lists with a string as car, returns list with shortcuts added to these cars. Stores a list of all the shortcuts in the free variable `tmm-short-cuts'." @@ -362,7 +354,6 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'." (set-buffer-modified-p nil))) (defun tmm-add-prompt () - (remove-hook 'minibuffer-setup-hook 'tmm-add-prompt) (add-hook 'minibuffer-exit-hook 'tmm-delete-map nil t) (unless tmm-c-prompt (error "No active menu entries")) @@ -387,9 +378,7 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'." (save-selected-window (other-window 1) ; Electric-pop-up-window does ; not work in minibuffer - (Electric-pop-up-window "*Completions*") - (with-current-buffer "*Completions*" - (setq tmm-old-comp-map (tmm-define-keys nil)))) + (Electric-pop-up-window "*Completions*")) (insert tmm-c-prompt)) (defun tmm-delete-map () @@ -424,16 +413,18 @@ Stores a list of all the shortcuts in the free variable `tmm-short-cuts'." (exit-minibuffer))))) (defun tmm-goto-completions () + "Jump to the completions buffer." (interactive) (let ((prompt-end (minibuffer-prompt-end))) (setq tmm-c-prompt (buffer-substring prompt-end (point-max))) + ;; FIXME: Why? (delete-region prompt-end (point-max))) (switch-to-buffer-other-window "*Completions*") (search-forward tmm-c-prompt) (search-backward tmm-c-prompt)) (defun tmm-get-keymap (elt &optional in-x-menu) - "Prepends (DOCSTRING EVENT BINDING) to free variable `tmm-km-list'. + "Prepend (DOCSTRING EVENT BINDING) to free variable `tmm-km-list'. The values are deduced from the argument ELT, that should be an element of keymap, an `x-popup-menu' argument, or an element of `x-popup-menu' argument (when IN-X-MENU is not-nil). diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 1b6890e5252..47f006eebda 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,18 @@ +2011-11-15 Juanma Barranquero <lekktu@gmail.com> + + * url-dav.el (url-dav-delete-file): Fix typo. + +2011-11-14 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * url-http.el (url-http-async-sentinel): If the server hangs up + while we're talking to it, just `message' the error instead of + throwing an error. + +2011-11-03 Lars Magne Ingebrigtsen <larsi@gnus.org> + + * url-cookie.el (url-cookie-expired-p): Protect against + zero-length cookie expiry dates. + 2011-10-19 Chong Yidong <cyd@gnu.org> * url-handlers.el (url-handler-mode): Doc fix. diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el index 78afa1633b6..f8417791ce5 100644 --- a/lisp/url/url-cookie.el +++ b/lisp/url/url-cookie.el @@ -156,7 +156,8 @@ telling Microsoft that." (defun url-cookie-expired-p (cookie) "Return non-nil if COOKIE is expired." (let ((exp (url-cookie-expires cookie))) - (and exp (> (float-time) (float-time (date-to-time exp)))))) + (and (> (length exp) 0) + (> (float-time) (float-time (date-to-time exp)))))) (defun url-cookie-retrieve (host &optional localpart secure) "Retrieve all cookies for a specified HOST and LOCALPART." diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el index 3d1f6afcb0e..9e29de0cbed 100644 --- a/lisp/url/url-dav.el +++ b/lisp/url/url-dav.el @@ -117,7 +117,7 @@ ;; We need to populate 'time' with ;; (SEC MIN HOUR DAY MON YEAR DOW DST TZ) - ;; Nobody else handles iso8601 correctly, lets do it ourselves. + ;; Nobody else handles iso8601 correctly, let's do it ourselves. (when (string-match date-re date-string re-start) (setq year (string-to-number (match-string 1 date-string)) month (string-to-number (match-string 2 date-string)) @@ -430,7 +430,7 @@ added to this list, so most requests can just pass in nil." ;; Take care of the default value for depth... (setq depth (or depth 0)) - ;; Now lets translate it into something webdav can understand. + ;; Now let's translate it into something webdav can understand. (if (< depth 0) (setq depth "Infinity") (setq depth (int-to-string depth))) @@ -762,7 +762,7 @@ files in the collection as well." (setq status (plist-get (cdr result) 'DAV:status)) (if (not (url-dav-http-success-p status)) (signal 'file-error (list "Removing old name" - "Errror removing" + "Error removing" (car result) status)))) props)) nil) @@ -909,7 +909,7 @@ Returns nil if URL contains no name starting with FILE." ;; Only one file and FILE matches it exactly... t) (t - ;; Need to figure out the longest string that they have in commmon + ;; Need to figure out the longest string that they have in common (setq matches (sort matches (lambda (a b) (> (length a) (length b))))) (let ((n (length file)) (searching t) diff --git a/lisp/url/url-future.el b/lisp/url/url-future.el index ac85a3cec47..8a2c112715c 100644 --- a/lisp/url/url-future.el +++ b/lisp/url/url-future.el @@ -36,7 +36,7 @@ ;; So, to get the value: ;; (when (url-future-completed-p future) (url-future-value future)) -;; See the ERT tests and the code for futher details. +;; See the ERT tests and the code for further details. ;;; Code: diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 557ef33919c..bb7744be434 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -257,7 +257,7 @@ request.") (if (not (equal extra-headers "")) (setq extra-headers (concat extra-headers "\r\n"))) - ;; This was done with a call to `format'. Concatting parts has + ;; This was done with a call to `format'. Concatenating parts has ;; the advantage of keeping the parts of each header together and ;; allows us to elide null lines directly, at the cost of making ;; the layout less clear. @@ -702,7 +702,7 @@ should be shown to the user." (not-acceptable ; 406 ;; The resource identified by the request is only capable of ;; generating response entities which have content - ;; characteristics nota cceptable according to the accept + ;; characteristics not acceptable according to the accept ;; headers sent in the request. (setq success t)) (proxy-authentication-required ; 407 @@ -1092,7 +1092,7 @@ the end of the document." (url-http-activate-callback))) ((string= "CONNECT" url-http-method) ;; A CONNECT request is finished, but we cannot stick this - ;; back on the free connectin list + ;; back on the free connection list (url-http-debug "CONNECT request must have headers only.") (when (url-http-parse-headers) (url-http-activate-callback))) @@ -1255,7 +1255,11 @@ CBARGS as the arguments." (url-http-end-of-document-sentinel proc why)) ((string= (substring why 0 4) "open") (setq url-http-connection-opened t) - (process-send-string proc (url-http-create-request))) + (condition-case error + (process-send-string proc (url-http-create-request)) + (file-error + (setq url-http-connection-opened nil) + (message "HTTP error: %s" error)))) (t (setf (car url-callback-arguments) (nconc (list :error (list 'error 'connection-failed why diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el index bb937a44423..8a7bb76160b 100644 --- a/lisp/url/url-ldap.el +++ b/lisp/url/url-ldap.el @@ -173,7 +173,7 @@ URL can be a URL string, or a URL vector of the type returned by (if attributes (setq attributes (mapcar 'url-unhex-string (split-string attributes ",")))) - ;; Parse out the exentions + ;; Parse out the extensions. (if extensions (setq extensions (mapcar (lambda (ext) (if (string-match "\\([^=]*\\)=\\(.*\\)" ext) diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el index 42d33553e14..cfb98c6937e 100644 --- a/lisp/url/url-vars.el +++ b/lisp/url/url-vars.el @@ -335,7 +335,7 @@ Currently supported methods: `socks': Connect through a socks server; `tls': Connect with TLS; `ssl': Connect with SSL (deprecated, use `tls' instead); -`native': Connect directy." +`native': Connect directly." :type '(radio (const :tag "Telnet to gateway host" :value telnet) (const :tag "Rlogin to gateway host" :value rlogin) (const :tag "Use SOCKS proxy" :value socks) diff --git a/lisp/url/url.el b/lisp/url/url.el index 7136b6023ce..c95b61c43fb 100644 --- a/lisp/url/url.el +++ b/lisp/url/url.el @@ -252,7 +252,7 @@ no further processing). URL is either a string or a parsed URL." ;; interrupt it before it got a chance to handle process input. ;; `sleep-for' was tried but it lead to other forms of ;; hanging. --Stef - (unless (or (with-local-quit + (unless (or (with-local-quit (accept-process-output proc)) (null proc)) ;; accept-process-output returned nil, maybe because the process @@ -290,7 +290,7 @@ no further processing). URL is either a string or a parsed URL." ;; These requires could advantageously be moved to url-mm-callback or ;; turned into autoloads, but I suspect that it would introduce some bugs ;; because loading those files from a process sentinel or filter may - ;; result in some undesirable carner cases. + ;; result in some undesirable corner cases. (require 'mm-decode) (require 'mm-view) (url-retrieve url 'url-mm-callback nil)) diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el index eeaa2cfa927..787a8b7c0f1 100644 --- a/lisp/vc/ediff-init.el +++ b/lisp/vc/ediff-init.el @@ -81,7 +81,7 @@ that Ediff doesn't know about.") ;; so that `kill-all-local-variables' (called by major-mode setting ;; commands) won't destroy Ediff control variables. ;; -;; Plagiarised from `emerge-defvar-local' for XEmacs. +;; Plagiarized from `emerge-defvar-local' for XEmacs. (defmacro ediff-defvar-local (var value doc) "Defines VAR as a local variable." (declare (indent defun)) diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el index d930a1bec69..ef273c610fe 100644 --- a/lisp/vc/ediff-ptch.el +++ b/lisp/vc/ediff-ptch.el @@ -635,7 +635,7 @@ optional argument, then use it." ;; Traditional patch has weird return codes. ;; GNU and Posix return 1 if some hanks failed and 2 in case of trouble. ;; 0 is a good code in all cases. -;; We'll do the concervative thing. +;; We'll do the conservative thing. (defun ediff-patch-return-code-ok (code) (eq code 0)) ;;; (if (eq (ediff-test-patch-utility) 'traditional) diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 5a7fa0bf950..9bf75fa7f55 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -1127,7 +1127,7 @@ It assumes that it is called from within the control buffer." ;; Revise the mode line to display which difference we have selected ;; Also resets modelines of buffers A/B, since they may be clobbered by -;; anothe invocations of Ediff. +;; other invocations of Ediff. (defun ediff-refresh-mode-lines () (let (buf-A-state-diff buf-B-state-diff buf-C-state-diff buf-C-state-merge) diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 46b95130ca0..f6340392dc2 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el @@ -502,7 +502,7 @@ It is expected to call the function.") (if (or (null cvs-version) (or (>= (cdr cvs-version) 10) (> (car cvs-version) 1))) ;; Supposedly some recent versions of CVS output some directory info - ;; as they recurse downthe tree, but it's not good enough in the case + ;; as they recurse down the tree, but it's not good enough in the case ;; where we run "cvs status foo bar/foo". '("status") t) diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el index 311841d37a0..4915cb9bf7f 100644 --- a/lisp/vc/pcvs-util.el +++ b/lisp/vc/pcvs-util.el @@ -307,7 +307,7 @@ If it is \\[universal-argument] \\[universal-argument], behave just See `cvs-prefix-set' for further description of the behavior.")) (defvar ,cps (let ((defaults ,defaults)) - ;; sanity ensurance + ;; sanity insurance (unless (>= (length defaults) cvs-prefix-number) (setq defaults (append defaults (make-list (1- cvs-prefix-number) diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 5595dc0b03f..256719d4c84 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -620,7 +620,7 @@ If non-nil, NEW means to create a new buffer no matter what." (str (car hf)) (done "") (tin (ewoc-nth cvs-cookies 0))) - ;; look for the first *real* fileinfo (to determine emptyness) + ;; look for the first *real* fileinfo (to determine emptiness) (while (and tin (memq (cvs-fileinfo->type (ewoc-data tin)) diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 35fa11c2e5e..148f6cde930 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -72,7 +72,7 @@ An empty list disables VC altogether." :group 'vc) ;; Note: we don't actually have a darcs back end yet. -;; Also, Meta-CVS (corresponsding to MCVS) is unsupported. +;; Also, Meta-CVS (corresponding to MCVS) is unsupported. (defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS" ".svn" ".git" ".hg" ".bzr" "_MTN" "_darcs" "{arch}")) @@ -456,8 +456,8 @@ For registered files, the value returned is one of: 'edited The working file has been edited by the user. If locking is used for the file, this state means that the current version is locked by the calling user. - This status should *not* be reported for files - which have a changed mtime but the same content + This status should *not* be reported for files + which have a changed mtime but the same content as the repo copy. USER The current version of the working file is locked by diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 8051009a983..39c583b8a0d 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -1399,7 +1399,7 @@ The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension." ;; `incg' or `buffer-substring-no-properties'. (This is ;; for speed; strictly speaking, it is sufficient to use ;; only the former since it behaves identically to the - ;; latter in the absense of "@@".) + ;; latter in the absence of "@@".) sub) (flet ((incg (beg end) (let ((b beg) (e end) @-holes) (while (and asc (< (car asc) e)) diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 7362258a42d..d014c4da135 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el @@ -263,8 +263,8 @@ RESULT is a list of conses (FILE . STATE) for directory DIR." (defun vc-svn-create-repo () "Create a new SVN repository." (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN")) - (vc-do-command "*vc*" 0 vc-svn-program '(".") - "checkout" (concat "file://" default-directory "SVN"))) + (vc-svn-command "*vc*" 0 "." "checkout" + (concat "file://" default-directory "SVN"))) (defun vc-svn-register (files &optional rev comment) "Register FILES into the SVN version-control system. @@ -334,7 +334,6 @@ This is only possible if SVN is responsible for FILE's directory.") ;; Check out a particular version (or recreate the file). (vc-file-setprop file 'vc-working-revision nil) (apply 'vc-svn-command nil 0 file - "--non-interactive" ; bug#4280 "update" (cond ((null rev) "-rBASE") @@ -373,7 +372,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION." (message "Merging changes into %s..." file) ;; (vc-file-setprop file 'vc-working-revision nil) (vc-file-setprop file 'vc-checkout-time 0) - (vc-svn-command nil 0 file "--non-interactive" "update") ; see bug#7152 + (vc-svn-command nil 0 file "update") ;; Analyze the merge result reported by SVN, and set ;; file properties accordingly. (with-current-buffer (get-buffer "*vc*") @@ -425,7 +424,7 @@ This is only supported if the repository access method is either file:// or svn+ssh://." (let (tempfile host remotefile directory fileurl-p) (with-temp-buffer - (vc-do-command (current-buffer) 0 vc-svn-program nil "info") + (vc-svn-command (current-buffer) 0 nil "info") (goto-char (point-min)) (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t) (error "Repository information is unavailable")) @@ -581,12 +580,19 @@ NAME is assumed to be a URL." (defun vc-svn-command (buffer okstatus file-or-list &rest flags) "A wrapper around `vc-do-command' for use in vc-svn.el. The difference to vc-do-command is that this function always invokes `svn', -and that it passes `vc-svn-global-switches' to it before FLAGS." - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list - (if (stringp vc-svn-global-switches) +and that it passes \"--non-interactive\" and `vc-svn-global-switches' to +it before FLAGS." + ;; Might be nice if svn defaulted to non-interactive if stdin not tty. + ;; http://svn.haxx.se/dev/archive-2008-05/0762.shtml + ;; http://svn.haxx.se/dev/archive-2009-04/0094.shtml + ;; Maybe newer ones do? + (or (member "--non-interactive" + (setq flags (if (stringp vc-svn-global-switches) (cons vc-svn-global-switches flags) - (append vc-svn-global-switches - flags)))) + (append vc-svn-global-switches flags)))) + (setq flags (cons "--non-interactive" flags))) + (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list + flags)) (defun vc-svn-repository-hostname (dirname) (with-temp-buffer @@ -700,7 +706,7 @@ information about FILENAME and return its status." (vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev)))) (defun vc-svn-annotate-time-of-rev (rev) - ;; Arbitrarily assume 10 commmits per day. + ;; Arbitrarily assume 10 commits per day. (/ (string-to-number rev) 10.0)) (defvar vc-annotate-parent-rev) diff --git a/lisp/view.el b/lisp/view.el index ef865007332..6955fbdfad8 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -925,7 +925,7 @@ for highlighting the match that is found." (defun view-search (times regexp) ;; This function does the job for all the View-search- commands. - ;; Search for the TIMESt match for REGEXP. If TIMES is negative + ;; Search for the TIMESth match for REGEXP. If TIMES is negative ;; search backwards. If REGEXP is nil use `view-last-regexp'. ;; Characters "!" and "@" have a special meaning at the beginning of ;; REGEXP and are removed from REGEXP before the search "!" means diff --git a/lisp/whitespace.el b/lisp/whitespace.el index f50386b1827..53a35b4f0b3 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -525,7 +525,7 @@ evaluated instead of indentation::space value. One reason for not visualize spaces via faces (if `face' is not included in `whitespace-style') is to use exclusively for -cleanning up a buffer. See `whitespace-cleanup' and +cleaning up a buffer. See `whitespace-cleanup' and `whitespace-cleanup-region' for documentation. See also `whitespace-display-mappings' for documentation." @@ -2573,7 +2573,7 @@ Also refontify when necessary." (setq whitespace-display-table-was-local t whitespace-display-table (copy-sequence buffer-display-table)) - ;; asure `buffer-display-table' is unique + ;; Assure `buffer-display-table' is unique ;; when two or more windows are visible. (setq buffer-display-table (copy-sequence buffer-display-table))) diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index b0d00242f2a..8c4df9fc9cf 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -2363,7 +2363,7 @@ Return an alist of (TYPE MATCH)." result)) (defun widget-checklist-validate (widget) - ;; Ticked chilren must be valid. + ;; Ticked children must be valid. (let ((children (widget-get widget :children)) child button found) (while (and children (not found)) diff --git a/lisp/windmove.el b/lisp/windmove.el index 2aef37dd4c8..1deaa44c7dd 100644 --- a/lisp/windmove.el +++ b/lisp/windmove.el @@ -245,7 +245,7 @@ placement bugs in old versions of Emacs." ;; Actually, the whole subject of the minibuffer edge of the frame is ;; rather messy. It turns out that with a sufficiently large delta, ;; we can fly off the bottom edge of the frame and miss the minibuffer -;; altogther. This, I think, is never right: if there's a minibuffer +;; altogether. This, I think, is never right: if there's a minibuffer ;; and you're not in it, and you move down, the minibuffer should be ;; in your way. ;; diff --git a/lisp/window.el b/lisp/window.el index d254248c2c7..10c6adc04e4 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -68,19 +68,19 @@ are not altered by this macro (unless they are altered in BODY)." ;; they don't substitute the selected window for nil), and they return ;; nil when WINDOW doesn't have a parent (like a frame's root window or ;; a minibuffer window). -(defsubst window-right (window) +(defun window-right (window) "Return WINDOW's right sibling. Return nil if WINDOW is the root window of its frame. WINDOW can be any window." (and window (window-parent window) (window-next-sibling window))) -(defsubst window-left (window) +(defun window-left (window) "Return WINDOW's left sibling. Return nil if WINDOW is the root window of its frame. WINDOW can be any window." (and window (window-parent window) (window-prev-sibling window))) -(defsubst window-child (window) +(defun window-child (window) "Return WINDOW's first child window." (or (window-top-child window) (window-left-child window))) @@ -100,13 +100,15 @@ be any window." (setq window (window-next-sibling window)))) window) -(defsubst window-any-p (object) - "Return t if OBJECT denotes a live or internal window." +(defun window-valid-p (object) + "Return t if OBJECT denotes a live window or internal window. +Otherwise, return nil; this includes the case where OBJECT is a +deleted window." (and (windowp object) (or (window-buffer object) (window-child object)) t)) -(defsubst window-normalize-buffer (buffer-or-name) +(defun window-normalize-buffer (buffer-or-name) "Return buffer specified by BUFFER-OR-NAME. BUFFER-OR-NAME must be either a buffer or a string naming a live buffer and defaults to the current buffer." @@ -121,7 +123,7 @@ buffer and defaults to the current buffer." (t (error "No such buffer %s" buffer-or-name)))) -(defsubst window-normalize-frame (frame) +(defun window-normalize-frame (frame) "Return frame specified by FRAME. FRAME must be a live frame and defaults to the selected frame." (if frame @@ -130,24 +132,21 @@ FRAME must be a live frame and defaults to the selected frame." (error "%s is not a live frame" frame)) (selected-frame))) -(defsubst window-normalize-any-window (window) +(defun window-normalize-window (window &optional live-only) "Return window specified by WINDOW. -WINDOW must be a window that has not been deleted and defaults to -the selected window." - (if window - (if (window-any-p window) - window - (error "%s is not a window" window)) - (selected-window))) - -(defsubst window-normalize-live-window (window) - "Return live window specified by WINDOW. -WINDOW must be a live window and defaults to the selected one." - (if window - (if (and (windowp window) (window-buffer window)) - window - (error "%s is not a live window" window)) - (selected-window))) +If WINDOW is nil, return `selected-window'. +If WINDOW is a live window or internal window, return WINDOW; + if LIVE-ONLY is non-nil, return WINDOW for a live window only. +Otherwise, signal an error." + (cond ((null window) + (selected-window)) + (live-only + (if (window-live-p window) + window + (error "%s is not a live window" window))) + ((if (window-valid-p window) + window + (error "%s is not a window" window))))) (defvar ignore-window-parameters nil "If non-nil, standard functions ignore window parameters. @@ -196,38 +195,37 @@ narrower, explictly specify the SIZE argument of that function." :version "24.1" :group 'windows) -(defun window-combination-p (&optional window horizontal) - "If WINDOW is a vertical combination return WINDOW's first child. -WINDOW can be any window and defaults to the selected one. -Optional argument HORIZONTAL non-nil means return WINDOW's first -child if WINDOW is a horizontal combination." - (setq window (window-normalize-any-window window)) - (if horizontal - (window-left-child window) - (window-top-child window))) +(defun window-combined-p (&optional window horizontal) + "Return non-nil if WINDOW has siblings in a given direction. +If WINDOW is omitted or nil, it defaults to the selected window. -(defsubst window-combined-p (&optional window horizontal) - "Return non-nil if and only if WINDOW is vertically combined. -WINDOW can be any window and defaults to the selected one. -Optional argument HORIZONTAL non-nil means return non-nil if and -only if WINDOW is horizontally combined." - (setq window (window-normalize-any-window window)) +HORIZONTAL determines a direction for the window combination. +If HORIZONTAL is omitted or nil, return non-nil if WINDOW is part +of a vertical window combination. +If HORIZONTAL is non-nil, return non-nil if WINDOW is part of a +horizontal window combination." + (setq window (window-normalize-window window)) (let ((parent (window-parent window))) - (and parent (window-combination-p parent horizontal)))) - -(defun window-combinations (&optional window horizontal) - "Return largest number of vertically arranged subwindows of WINDOW. -WINDOW can be any window and defaults to the selected one. -Optional argument HORIZONTAL non-nil means to return the largest -number of horizontally arranged subwindows of WINDOW." - (setq window (window-normalize-any-window window)) + (and parent + (if horizontal + (window-left-child parent) + (window-top-child parent))))) + +(defun window-combinations (window &optional horizontal) + "Return largest number of windows vertically arranged within WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. +If HORIZONTAL is non-nil, return the largest number of +windows horizontally arranged within WINDOW." + (setq window (window-normalize-window window)) (cond ((window-live-p window) ;; If WINDOW is live, return 1. 1) - ((window-combination-p window horizontal) + ((if horizontal + (window-left-child window) + (window-top-child window)) ;; If WINDOW is iso-combined, return the sum of the values for all - ;; subwindows of WINDOW. + ;; child windows of WINDOW. (let ((child (window-child window)) (count 0)) (while child @@ -238,7 +236,7 @@ number of horizontally arranged subwindows of WINDOW." count)) (t ;; If WINDOW is not iso-combined, return the maximum value of any - ;; subwindow of WINDOW. + ;; child window of WINDOW. (let ((child (window-child window)) (count 1)) (while child @@ -281,39 +279,19 @@ unpredictable." proc (frame-root-window walk-window-tree-frame) any))) (defun walk-window-subtree (proc &optional window any) - "Run function PROC on each live subwindow of WINDOW. + "Run function PROC on the subtree of windows rooted at WINDOW. WINDOW defaults to the selected window. PROC must be a function -with one argument - a window. ANY, if non-nil means to run PROC -on all live and internal subwindows of WINDOW. +with one argument - a window. By default, run PROC only on live +windows of the subtree. If the optional argument ANY is non-nil, +run PROC on all live and internal windows of the subtree. If +WINDOW is live, run PROC on WINDOW only. This function performs a pre-order, depth-first traversal of the -window tree rooted at WINDOW. If PROC changes that window tree, -the result is unpredictable." - (setq window (window-normalize-any-window window)) +subtree rooted at WINDOW. If PROC changes that tree, the result +is unpredictable." + (setq window (window-normalize-window window)) (walk-window-tree-1 proc window any t)) -(defun windows-with-parameter (parameter &optional value frame any values) - "Return a list of all windows on FRAME with PARAMETER non-nil. -FRAME defaults to the selected frame. Optional argument VALUE -non-nil means only return windows whose window-parameter value of -PARAMETER equals VALUE \(comparison is done using `equal'). -Optional argument ANY non-nil means consider internal windows -too. Optional argument VALUES non-nil means return a list of cons -cells whose car is the value of the parameter and whose cdr is -the window." - (let (this-value windows) - (walk-window-tree - (lambda (window) - (when (and (setq this-value (window-parameter window parameter)) - (or (not value) (or (equal value this-value)))) - (setq windows - (if values - (cons (cons this-value window) windows) - (cons window windows))))) - frame any) - - (nreverse windows))) - (defun window-with-parameter (parameter &optional value frame any) "Return first window on FRAME with PARAMETER non-nil. FRAME defaults to the selected frame. Optional argument VALUE @@ -335,7 +313,7 @@ too." "Return root of atomic window WINDOW is a part of. WINDOW can be any window and defaults to the selected one. Return nil if WINDOW is not part of a atomic window." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (let (root) (while (and window (window-parameter window 'window-atom)) (setq root window) @@ -353,8 +331,8 @@ WINDOW must be an internal window. Return WINDOW." window t) window)) -(defun window-atom-check-1 (window) - "Subroutine of `window-atom-check'." +(defun window--atom-check-1 (window) + "Subroutine of `window--atom-check'." (when window (if (window-parameter window 'window-atom) (let ((count 0)) @@ -375,18 +353,18 @@ WINDOW must be an internal window. Return WINDOW." window t))) ;; Check children. (unless (window-buffer window) - (window-atom-check-1 (window-left-child window)) - (window-atom-check-1 (window-top-child window)))) + (window--atom-check-1 (window-left-child window)) + (window--atom-check-1 (window-top-child window)))) ;; Check right sibling - (window-atom-check-1 (window-right window)))) + (window--atom-check-1 (window-right window)))) -(defun window-atom-check (&optional frame) +(defun window--atom-check (&optional frame) "Check atomicity of all windows on FRAME. FRAME defaults to the selected frame. If an atomic window is -wrongly configured, reset the atomicity of all its subwindows to -nil. An atomic window is wrongly configured if it has no -subwindows or one of its subwindows is not atomic." - (window-atom-check-1 (frame-root-window frame))) +wrongly configured, reset the atomicity of all its windows on +FRAME to nil. An atomic window is wrongly configured if it has +no child windows or one of its child windows is not atomic." + (window--atom-check-1 (frame-root-window frame))) ;; Side windows. (defvar window-sides '(left top right bottom) @@ -441,7 +419,7 @@ number of slots on that side." (integer :tag "Number" :value 3 :size 5))) :group 'windows) -(defun window-side-check (&optional frame) +(defun window--side-check (&optional frame) "Check the window-side parameter of all windows on FRAME. FRAME defaults to the selected frame. If the configuration is invalid, reset all window-side parameters to nil. @@ -512,11 +490,11 @@ A valid configuration has to preserve the following invariant: (set-window-parameter window 'window-side nil)) frame t)))) -(defun window-check (&optional frame) +(defun window--check (&optional frame) "Check atomic and side windows on FRAME. FRAME defaults to the selected frame." - (window-side-check frame) - (window-atom-check frame)) + (window--side-check frame) + (window--atom-check frame)) ;;; Window sizes. (defvar window-size-fixed nil @@ -530,9 +508,9 @@ unless it has no other choice \(like when deleting a neighboring window).") (make-variable-buffer-local 'window-size-fixed) -(defsubst window-size-ignore (window ignore) +(defun window--size-ignore (window ignore) "Return non-nil if IGNORE says to ignore size restrictions for WINDOW." - (if (window-any-p ignore) (eq window ignore) ignore)) + (if (window-valid-p ignore) (eq window ignore) ignore)) (defun window-min-size (&optional window horizontal ignore) "Return the minimum number of lines of WINDOW. @@ -547,7 +525,7 @@ windows may get as small as `window-safe-min-height' lines and `window-safe-min-width' columns. IGNORE a window means ignore restrictions for that window only." (window-min-size-1 - (window-normalize-any-window window) horizontal ignore)) + (window-normalize-window window) horizontal ignore)) (defun window-min-size-1 (window horizontal ignore) "Internal function of `window-min-size'." @@ -557,13 +535,13 @@ restrictions for that window only." ;; WINDOW is an internal window. (if (window-combined-p sub horizontal) ;; The minimum size of an iso-combination is the sum of - ;; the minimum sizes of its subwindows. + ;; the minimum sizes of its child windows. (while sub (setq value (+ value (window-min-size-1 sub horizontal ignore))) (setq sub (window-right sub))) ;; The minimum size of an ortho-combination is the maximum of - ;; the minimum sizes of its subwindows. + ;; the minimum sizes of its child windows. (while sub (setq value (max value (window-min-size-1 sub horizontal ignore))) @@ -571,7 +549,7 @@ restrictions for that window only." value) (with-current-buffer (window-buffer window) (cond - ((and (not (window-size-ignore window ignore)) + ((and (not (window--size-ignore window ignore)) (window-size-fixed-p window horizontal)) ;; The minimum size of a fixed size window is its size. (window-total-size window horizontal)) @@ -600,7 +578,7 @@ restrictions for that window only." (ceiling (or (frame-parameter frame 'scroll-bar-width) 14) (frame-char-width))) (t 0))) - (if (and (not (window-size-ignore window ignore)) + (if (and (not (window--size-ignore window ignore)) (numberp window-min-width)) window-min-width 0)))) @@ -610,7 +588,7 @@ restrictions for that window only." (max (+ window-safe-min-height (if header-line-format 1 0) (if mode-line-format 1 0)) - (if (and (not (window-size-ignore window ignore)) + (if (and (not (window--size-ignore window ignore)) (numberp window-min-height)) window-min-height 0)))))))) @@ -621,8 +599,9 @@ Optional argument HORIZONTAL non-nil means return DELTA if DELTA columns can be added to WINDOW. A return value of zero means that no lines (or columns) can be added to WINDOW. -This function looks only at WINDOW and its subwindows. The -function `window-resizable' looks at other windows as well. +This function looks only at WINDOW and, recursively, its child +windows. The function `window-resizable' looks at other windows +as well. DELTA positive means WINDOW shall be enlarged by DELTA lines or columns. If WINDOW cannot be enlarged by DELTA lines or columns @@ -640,13 +619,13 @@ imposed by fixed size windows, `window-min-height' or windows may get as small as `window-safe-min-height' lines and `window-safe-min-width' columns. IGNORE any window means ignore restrictions for that window only." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (cond ((< delta 0) (max (- (window-min-size window horizontal ignore) (window-total-size window horizontal)) delta)) - ((window-size-ignore window ignore) + ((window--size-ignore window ignore) delta) ((> delta 0) (if (window-size-fixed-p window horizontal) @@ -654,40 +633,40 @@ restrictions for that window only." delta)) (t 0))) -(defsubst window-sizable-p (window delta &optional horizontal ignore) +(defun window-sizable-p (window delta &optional horizontal ignore) "Return t if WINDOW can be resized by DELTA lines. For the meaning of the arguments of this function see the doc-string of `window-sizable'." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (if (> delta 0) (>= (window-sizable window delta horizontal ignore) delta) (<= (window-sizable window delta horizontal ignore) delta))) -(defun window-size-fixed-1 (window horizontal) +(defun window--size-fixed-1 (window horizontal) "Internal function for `window-size-fixed-p'." (let ((sub (window-child window))) (catch 'fixed (if sub ;; WINDOW is an internal window. (if (window-combined-p sub horizontal) - ;; An iso-combination is fixed size if all its subwindows - ;; are fixed-size. + ;; An iso-combination is fixed size if all its child + ;; windows are fixed-size. (progn (while sub - (unless (window-size-fixed-1 sub horizontal) - ;; We found a non-fixed-size subwindow, so WINDOW's - ;; size is not fixed. + (unless (window--size-fixed-1 sub horizontal) + ;; We found a non-fixed-size child window, so + ;; WINDOW's size is not fixed. (throw 'fixed nil)) (setq sub (window-right sub))) - ;; All subwindows are fixed-size, so WINDOW's size is + ;; All child windows are fixed-size, so WINDOW's size is ;; fixed. (throw 'fixed t)) ;; An ortho-combination is fixed-size if at least one of its - ;; subwindows is fixed-size. + ;; child windows is fixed-size. (while sub - (when (window-size-fixed-1 sub horizontal) - ;; We found a fixed-size subwindow, so WINDOW's size is - ;; fixed. + (when (window--size-fixed-1 sub horizontal) + ;; We found a fixed-size child window, so WINDOW's size + ;; is fixed. (throw 'fixed t)) (setq sub (window-right sub)))) ;; WINDOW is a live window. @@ -703,10 +682,10 @@ window. Optional argument HORIZONTAL non-nil means return non-nil if WINDOW's width is fixed. If this function returns nil, this does not necessarily mean that -WINDOW can be resized in the desired direction. The functions -`window-resizable' and `window-resizable-p' will tell that." - (window-size-fixed-1 - (window-normalize-any-window window) horizontal)) +WINDOW can be resized in the desired direction. The function +`window-resizable' can tell that." + (window--size-fixed-1 + (window-normalize-window window) horizontal)) (defun window-min-delta-1 (window delta &optional horizontal ignore trail noup) "Internal function for `window-min-delta'." @@ -719,22 +698,22 @@ WINDOW can be resized in the desired direction. The functions (catch 'done (if (window-combined-p sub horizontal) ;; In an iso-combination throw DELTA if we find at least one - ;; subwindow and that subwindow is either not of fixed-size - ;; or we can ignore fixed-sizeness. + ;; child window and that window is either not fixed-size or + ;; we can ignore fixed-sizeness. (let ((skip (eq trail 'after))) (while sub (cond ((eq sub window) (setq skip (eq trail 'before))) (skip) - ((and (not (window-size-ignore window ignore)) + ((and (not (window--size-ignore window ignore)) (window-size-fixed-p sub horizontal))) (t - ;; We found a non-fixed-size subwindow. + ;; We found a non-fixed-size child window. (throw 'done delta))) (setq sub (window-right sub)))) ;; In an ortho-combination set DELTA to the minimum value by - ;; which other subwindows can shrink. + ;; which other child windows can shrink. (while sub (unless (eq sub window) (setq delta @@ -770,9 +749,9 @@ Optional argument NOUP non-nil means don't go up in the window tree but try to enlarge windows within WINDOW's combination only. Optional argument NODOWN non-nil means don't check whether WINDOW -itself \(and its subwindows) can be shrunk; check only whether at -least one other windows can be enlarged appropriately." - (setq window (window-normalize-any-window window)) +itself \(and its child windows) can be shrunk; check only whether +at least one other window can be enlarged appropriately." + (setq window (window-normalize-window window)) (let ((size (window-total-size window horizontal)) (minimum (window-min-size window horizontal ignore))) (cond @@ -799,7 +778,7 @@ least one other windows can be enlarged appropriately." (catch 'fixed (if (window-combined-p sub horizontal) ;; For an iso-combination calculate how much we can get from - ;; other subwindows. + ;; other child windows. (let ((skip (eq trail 'after))) (while sub (cond @@ -813,10 +792,10 @@ least one other windows can be enlarged appropriately." (window-min-size sub horizontal ignore)))))) (setq sub (window-right sub)))) ;; For an ortho-combination throw DELTA when at least one - ;; subwindow is fixed-size. + ;; child window is fixed-size. (while sub (when (and (not (eq sub window)) - (not (window-size-ignore sub ignore)) + (not (window--size-ignore sub ignore)) (window-size-fixed-p sub horizontal)) (throw 'fixed delta)) (setq sub (window-right sub)))) @@ -852,10 +831,10 @@ tree but try to obtain the entire space from windows within WINDOW's combination. Optional argument NODOWN non-nil means do not check whether -WINDOW itself \(and its subwindows) can be enlarged; check only -whether other windows can be shrunk appropriately." - (setq window (window-normalize-any-window window)) - (if (and (not (window-size-ignore window ignore)) +WINDOW itself \(and its child windows) can be enlarged; check +only whether other windows can be shrunk appropriately." + (setq window (window-normalize-window window)) + (if (and (not (window--size-ignore window ignore)) (not nodown) (window-size-fixed-p window horizontal)) ;; With IGNORE and NOWDON nil return zero if WINDOW has fixed ;; size. @@ -864,14 +843,14 @@ whether other windows can be shrunk appropriately." (window-max-delta-1 window 0 horizontal ignore trail noup))) ;; Make NOUP also inhibit the min-size check. -(defun window-resizable (window delta &optional horizontal ignore trail noup nodown) +(defun window--resizable (window delta &optional horizontal ignore trail noup nodown) "Return DELTA if WINDOW can be resized vertically by DELTA lines. Optional argument HORIZONTAL non-nil means return DELTA if WINDOW can be resized horizontally by DELTA columns. A return value of zero means that WINDOW is not resizable. DELTA positive means WINDOW shall be enlarged by DELTA lines or -columns. If WINDOW cannot be enlarged by DELTA lines or columns +columns. If WINDOW cannot be enlarged by DELTA lines or columns, return the maximum value in the range 0..DELTA by which WINDOW can be enlarged. @@ -893,12 +872,13 @@ of or below WINDOW can be shrunk. Optional argument TRAIL shrunk. Optional argument NOUP non-nil means don't go up in the window -tree but try to distribute the space among the other windows -within WINDOW's combination. +tree but check only whether space can be obtained from (or given +to) WINDOW's siblings. -Optional argument NODOWN non-nil means don't check whether WINDOW -and its subwindows can be resized." - (setq window (window-normalize-any-window window)) +Optional argument NODOWN non-nil means don't go down in the +window tree. This means do not check whether resizing would +violate size restrictions of WINDOW or its child windows." + (setq window (window-normalize-window window)) (cond ((< delta 0) (max (- (window-min-delta window horizontal ignore trail noup nodown)) @@ -908,82 +888,87 @@ and its subwindows can be resized." delta)) (t 0))) -(defun window-resizable-p (window delta &optional horizontal ignore trail noup nodown) +(defun window--resizable-p (window delta &optional horizontal ignore trail noup nodown) "Return t if WINDOW can be resized vertically by DELTA lines. For the meaning of the arguments of this function see the -doc-string of `window-resizable'." - (setq window (window-normalize-any-window window)) +doc-string of `window--resizable'." + (setq window (window-normalize-window window)) (if (> delta 0) - (>= (window-resizable window delta horizontal ignore trail noup nodown) + (>= (window--resizable window delta horizontal ignore trail noup nodown) delta) - (<= (window-resizable window delta horizontal ignore trail noup nodown) + (<= (window--resizable window delta horizontal ignore trail noup nodown) delta))) -(defsubst window-total-height (&optional window) - "Return the total number of lines of WINDOW. -WINDOW can be any window and defaults to the selected one. The -return value includes WINDOW's mode line and header line, if any. -If WINDOW is internal the return value is the sum of the total -number of lines of WINDOW's child windows if these are vertically -combined and the height of WINDOW's first child otherwise. +(defun window-resizable (window delta &optional horizontal ignore) + "Return DELTA if WINDOW can be resized vertically by DELTA lines. +Optional argument HORIZONTAL non-nil means return DELTA if WINDOW +can be resized horizontally by DELTA columns. A return value of +zero means that WINDOW is not resizable. -Note: This function does not take into account the value of -`line-spacing' when calculating the number of lines in WINDOW." - (window-total-size window)) +DELTA positive means WINDOW shall be enlarged by DELTA lines or +columns. If WINDOW cannot be enlarged by DELTA lines or columns +return the maximum value in the range 0..DELTA by which WINDOW +can be enlarged. + +DELTA negative means WINDOW shall be shrunk by -DELTA lines or +columns. If WINDOW cannot be shrunk by -DELTA lines or columns, +return the minimum value in the range DELTA..0 that can be used +for shrinking WINDOW. + +Optional argument IGNORE non-nil means ignore any restrictions +imposed by fixed size windows, `window-min-height' or +`window-min-width' settings. IGNORE a window means ignore +restrictions for that window only. IGNORE equal `safe' means +live windows may get as small as `window-safe-min-height' lines +and `window-safe-min-width' columns." + (setq window (window-normalize-window window)) + (window--resizable window delta horizontal ignore)) + +(defun window-total-size (&optional window horizontal) + "Return the total height or width of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. + +If HORIZONTAL is omitted or nil, return the total height of +WINDOW, in lines, like `window-total-height'. Otherwise return +the total width, in columns, like `window-total-width'." + (if horizontal + (window-total-width window) + (window-total-height window))) ;; Eventually we should make `window-height' obsolete. (defalias 'window-height 'window-total-height) ;; See discussion in bug#4543. -(defsubst window-full-height-p (&optional window) +(defun window-full-height-p (&optional window) "Return t if WINDOW is as high as the containing frame. More precisely, return t if and only if the total height of WINDOW equals the total height of the root window of WINDOW's frame. WINDOW can be any window and defaults to the selected one." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (= (window-total-size window) (window-total-size (frame-root-window window)))) -(defsubst window-total-width (&optional window) - "Return the total number of columns of WINDOW. -WINDOW can be any window and defaults to the selected one. The -return value includes any vertical dividers or scrollbars of -WINDOW. If WINDOW is internal, the return value is the sum of -the total number of columns of WINDOW's child windows if these -are horizontally combined and the width of WINDOW's first child -otherwise." - (window-total-size window t)) - -(defsubst window-full-width-p (&optional window) +(defun window-full-width-p (&optional window) "Return t if WINDOW is as wide as the containing frame. More precisely, return t if and only if the total width of WINDOW equals the total width of the root window of WINDOW's frame. WINDOW can be any window and defaults to the selected one." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (= (window-total-size window t) (window-total-size (frame-root-window window) t))) -(defsubst window-body-height (&optional window) - "Return the number of lines of WINDOW's body. -WINDOW must be a live window and defaults to the selected one. - -The return value does not include WINDOW's mode line and header -line, if any. If a line at the bottom of the window is only -partially visible, that line is included in the return value. If -you do not want to include a partially visible bottom line in the -return value, use `window-text-height' instead." - (window-body-size window)) +(defun window-body-size (&optional window horizontal) + "Return the height or width of WINDOW's text area. +If WINDOW is omitted or nil, it defaults to the selected window. +Signal an error if the window is not live. -(defsubst window-body-width (&optional window) - "Return the number of columns of WINDOW's body. -WINDOW must be a live window and defaults to the selected one. - -The return value does not include any vertical dividers or scroll -bars owned by WINDOW. On a window-system the return value does -not include the number of columns used for WINDOW's fringes or -display margins either." - (window-body-size window t)) +If HORIZONTAL is omitted or nil, return the height of the text +area, like `window-body-height'. Otherwise, return the width of +the text area, like `window-body-width'." + (if horizontal + (window-body-width window) + (window-body-height window))) ;; Eventually we should make `window-height' obsolete. (defalias 'window-width 'window-body-width) @@ -1001,7 +986,7 @@ or nil). Unlike `window-scroll-bars', this function reports the scroll bar type actually used, once frame defaults and `scroll-bar-mode' are taken into account." - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) (let ((vert (nth 2 (window-scroll-bars window))) (hor nil)) (when (or (eq vert t) (eq hor t)) @@ -1065,7 +1050,7 @@ WINDOW can be any live window and defaults to the selected one. This function is like `window-point' with one exception: If WINDOW is selected, it returns the value of `point' of WINDOW's buffer regardless of whether that buffer is current or not." - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) (if (eq window (selected-window)) (with-current-buffer (window-buffer window) (point)) @@ -1078,7 +1063,7 @@ WINDOW can be any live window and defaults to the selected one. This function is like `set-window-point' with one exception: If WINDOW is selected, it moves `point' of WINDOW's buffer to POS regardless of whether that buffer is current or not." - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) (if (eq window (selected-window)) (with-current-buffer (window-buffer window) (goto-char pos)) @@ -1089,7 +1074,7 @@ regardless of whether that buffer is current or not." WINDOW can be any window and defaults to the selected one. SIDE can be any of the symbols `left', `top', `right' or `bottom'. The default value nil is handled like `bottom'." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (let ((edge (cond ((eq side 'left) 0) @@ -1099,7 +1084,7 @@ The default value nil is handled like `bottom'." (= (nth edge (window-edges window)) (nth edge (window-edges (frame-root-window window)))))) -(defun windows-at-side (&optional frame side) +(defun window-at-side-list (&optional frame side) "Return list of all windows on SIDE of FRAME. FRAME must be a live frame and defaults to the selected frame. SIDE can be any of the symbols `left', `top', `right' or @@ -1113,7 +1098,7 @@ SIDE can be any of the symbols `left', `top', `right' or frame) (nreverse windows))) -(defun window-in-direction-2 (window posn &optional horizontal) +(defun window--in-direction-2 (window posn &optional horizontal) "Support function for `window-in-direction'." (if horizontal (let ((top (window-top-line window))) @@ -1131,7 +1116,7 @@ DIRECTION must be one of `above', `below', `left' or `right'. WINDOW must be a live window and defaults to the selected one. IGNORE, when non-nil means a window can be returned even if its `no-other-window' parameter is non-nil." - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) (unless (memq direction '(above below left right)) (error "Wrong direction %s" direction)) (let* ((frame (window-frame window)) @@ -1183,7 +1168,7 @@ IGNORE, when non-nil means a window can be returned even if its ;; W is to the left or right of WINDOW but does not ;; cover POSN. (setq best-diff-2-new - (window-in-direction-2 w posn hor)) + (window--in-direction-2 w posn hor)) (or (< best-diff-2-new best-diff-2) (and (= best-diff-2-new best-diff-2) (if (eq direction 'left) @@ -1208,7 +1193,7 @@ IGNORE, when non-nil means a window can be returned even if its (and (eq direction 'below) (<= last w-top))) ;; W is above or below WINDOW but does not cover POSN. (setq best-diff-2-new - (window-in-direction-2 w posn hor)) + (window--in-direction-2 w posn hor)) (or (< best-diff-2-new best-diff-2) (and (= best-diff-2-new best-diff-2) (if (eq direction 'above) @@ -1451,9 +1436,9 @@ as small) as possible but don't signal an error." ;; Resize now. (window--resize-reset frame) - ;; Ideally we should be able to resize just the last subwindow of - ;; root here. See the comment in `resize-root-window-vertically' - ;; for why we do not do that. + ;; Ideally we should be able to resize just the last child of root + ;; here. See the comment in `resize-root-window-vertically' for + ;; why we do not do that. (window--resize-this-window root (- delta) nil nil t) (set-window-new-total window (+ height delta)) ;; The following routine catches the case where we want to resize @@ -1486,7 +1471,7 @@ This function resizes other windows proportionally and never deletes any windows. If you want to move only the low (right) edge of WINDOW consider using `adjust-window-trailing-edge' instead." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (let* ((frame (window-frame window)) sibling) (cond @@ -1494,15 +1479,15 @@ instead." (error "Cannot resize the root window of a frame")) ((window-minibuffer-p window) (window--resize-mini-window window delta)) - ((window-resizable-p window delta horizontal ignore) + ((window--resizable-p window delta horizontal ignore) (window--resize-reset frame horizontal) (window--resize-this-window window delta horizontal ignore t) - (if (and (not (window-splits window)) + (if (and (not window-combination-resize) (window-combined-p window horizontal) (setq sibling (or (window-right window) (window-left window))) (window-sizable-p sibling (- delta) horizontal ignore)) - ;; If window-splits returns nil for WINDOW, WINDOW is part of - ;; an iso-combination, and WINDOW's neighboring right or left + ;; If window-combination-resize is nil, WINDOW is part of an + ;; iso-combination, and WINDOW's neighboring right or left ;; sibling can be resized as requested, resize that sibling. (let ((normal-delta (/ (float delta) @@ -1520,14 +1505,14 @@ instead." (t (error "Cannot resize window %s" window))))) -(defsubst window--resize-subwindows-skip-p (window) +(defun window--resize-child-windows-skip-p (window) "Return non-nil if WINDOW shall be skipped by resizing routines." (memq (window-new-normal window) '(ignore stuck skip))) -(defun window--resize-subwindows-normal (parent horizontal window this-delta &optional trail other-delta) - "Set the new normal height of subwindows of window PARENT. +(defun window--resize-child-windows-normal (parent horizontal window this-delta &optional trail other-delta) + "Recursively set new normal height of child windows of window PARENT. HORIZONTAL non-nil means set the new normal width of these -windows. WINDOW specifies a subwindow of PARENT that has been +windows. WINDOW specifies a child window of PARENT that has been resized by THIS-DELTA lines \(columns). Optional argument TRAIL either 'before or 'after means set values @@ -1549,8 +1534,8 @@ PARENT in order to resize WINDOW." (parent-normal 0.0) (skip (eq trail 'after))) - ;; Set parent-normal to the sum of the normal sizes of all - ;; subwindows of PARENT that shall be resized, excluding only WINDOW + ;; Set parent-normal to the sum of the normal sizes of all child + ;; windows of PARENT that shall be resized, excluding only WINDOW ;; and any windows specified by the optional TRAIL argument. (while sub (cond @@ -1562,7 +1547,7 @@ PARENT in order to resize WINDOW." (+ parent-normal (window-normal-size sub horizontal))))) (setq sub (window-right sub))) - ;; Set the new normal size of all subwindows of PARENT from what + ;; Set the new normal size of all child windows of PARENT from what ;; they should have contributed for recovering THIS-DELTA lines ;; (columns). (setq sub (window-child parent)) @@ -1621,11 +1606,11 @@ PARENT in order to resize WINDOW." ;; Don't get larger than 1 or smaller than 0. (min 1.0 (max (- 1.0 sum) 0.0)))))) -(defun window--resize-subwindows (parent delta &optional horizontal window ignore trail edge) - "Resize subwindows of window PARENT vertically by DELTA lines. +(defun window--resize-child-windows (parent delta &optional horizontal window ignore trail edge) + "Resize child windows of window PARENT vertically by DELTA lines. PARENT must be a vertically combined internal window. -Optional argument HORIZONTAL non-nil means resize subwindows of +Optional argument HORIZONTAL non-nil means resize child windows of PARENT horizontally by DELTA columns. In this case PARENT must be a horizontally combined internal window. @@ -1657,10 +1642,10 @@ already set by this routine." (setq sub first) (while (and (window-right sub) (or (and (eq trail 'before) - (not (window--resize-subwindows-skip-p + (not (window--resize-child-windows-skip-p (window-right sub)))) (and (eq trail 'after) - (window--resize-subwindows-skip-p sub)))) + (window--resize-child-windows-skip-p sub)))) (setq sub (window-right sub))) sub) (if horizontal @@ -1688,7 +1673,7 @@ already set by this routine." window (- (window-normal-size window horizontal) (- (window-new-normal sub) (window-normal-size sub horizontal))))) - (window--resize-subwindows-normal + (window--resize-child-windows-normal parent horizontal sub 0 trail delta)) ;; Return 'normalized to notify `window--resize-siblings' that ;; normal sizes have been already set. @@ -1697,9 +1682,9 @@ already set by this routine." (setq sub first) (while sub (cond - ((or (window--resize-subwindows-skip-p sub) - ;; Ignore windows to skip and fixed-size subwindows - in - ;; the latter case make it a window to skip. + ((or (window--resize-child-windows-skip-p sub) + ;; Ignore windows to skip and fixed-size child windows - + ;; in the latter case make it a window to skip. (and (not ignore) (window-size-fixed-p sub horizontal) (set-window-new-normal sub 'ignore)))) @@ -1787,7 +1772,7 @@ already set by this routine." (set-window-new-normal sub)) (unless (eq (window-new-normal sub) 'ignore) - ;; Resize this subwindow's subwindows (back-engineering + ;; Resize this window's child windows (back-engineering ;; delta from sub's old and new total sizes). (let ((delta (- (window-new-total sub) (window-total-size sub horizontal)))) @@ -1837,7 +1822,7 @@ preferably only resize windows adjacent to EDGE." ;; Make sure this sibling is left alone when ;; resizing its siblings. (set-window-new-normal sub 'ignore)) - ((or (window-size-ignore sub ignore) + ((or (window--size-ignore sub ignore) (not (window-size-fixed-p sub horizontal))) ;; Set this-delta to t to signal that we found a sibling ;; of WINDOW whose size is not fixed. @@ -1848,7 +1833,7 @@ preferably only resize windows adjacent to EDGE." ;; Set this-delta to what we can get from WINDOW's siblings. (if (= (- delta) (window-total-size window horizontal)) ;; A deletion, presumably. We must handle this case - ;; specially since `window-resizable' can't be used. + ;; specially since `window--resizable' can't be used. (if this-delta ;; There's at least one resizable sibling we can ;; give WINDOW's size to. @@ -1857,7 +1842,7 @@ preferably only resize windows adjacent to EDGE." (setq this-delta 0)) ;; Any other form of resizing. (setq this-delta - (window-resizable window delta horizontal ignore trail t))) + (window--resizable window delta horizontal ignore trail t))) ;; Set other-delta to what we still have to get from ;; ancestor windows of parent. @@ -1870,19 +1855,19 @@ preferably only resize windows adjacent to EDGE." (if (zerop this-delta) ;; We haven't got anything from WINDOW's siblings but we ;; must update the normal sizes to respect other-delta. - (window--resize-subwindows-normal + (window--resize-child-windows-normal parent horizontal window this-delta trail other-delta) ;; We did get something from WINDOW's siblings which means - ;; we have to resize their subwindows. - (unless (eq (window--resize-subwindows + ;; we have to resize their child windows. + (unless (eq (window--resize-child-windows parent (- this-delta) horizontal window ignore trail edge) - ;; If `window--resize-subwindows' returns + ;; If `window--resize-child-windows' returns ;; 'normalized, this means it has set the ;; normal sizes already. 'normalized) ;; Set the normal sizes. - (window--resize-subwindows-normal + (window--resize-child-windows-normal parent horizontal window this-delta trail other-delta)) ;; Set DELTA to what we still have to get from ancestor ;; windows. @@ -1922,8 +1907,8 @@ resize only windows on the left or above EDGE. If TRAIL equals `after', resize only windows on the right or below EDGE. Also, preferably only resize windows adjacent to EDGE. -This function recursively resizes WINDOW's subwindows to fit the -new size. Make sure that WINDOW is `window-resizable' before +This function recursively resizes WINDOW's child windows to fit the +new size. Make sure that WINDOW is `window--resizable' before calling this function. Note that this function does not resize siblings of WINDOW or WINDOW's parent window. You have to eventually call `window-resize-apply' in order to make resizing @@ -1936,11 +1921,11 @@ actually take effect." (cond ((not sub)) ((window-combined-p sub horizontal) - ;; In an iso-combination resize subwindows according to their + ;; In an iso-combination resize child windows according to their ;; normal sizes. - (window--resize-subwindows + (window--resize-child-windows window delta horizontal nil ignore trail edge)) - ;; In an ortho-combination resize each subwindow by DELTA. + ;; In an ortho-combination resize each child window by DELTA. (t (while sub (window--resize-this-window @@ -1966,7 +1951,7 @@ resizes windows proportionally and never deletes any windows." "Resize root window WINDOW vertically by DELTA lines. If DELTA is less than zero and we can't shrink WINDOW by DELTA lines, shrink it as much as possible. If DELTA is greater than -zero, this function can resize fixed-size subwindows in order to +zero, this function can resize fixed-size windows in order to recover the necessary lines. Return the number of lines that were recovered. @@ -2005,7 +1990,7 @@ If DELTA is greater zero, then move the edge downwards or to the right. If DELTA is less than zero, move the edge upwards or to the left. If the edge can't be moved by DELTA lines or columns, move it as far as possible in the desired direction." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (let ((frame (window-frame window)) (right window) left this-delta min-delta max-delta failed) @@ -2063,7 +2048,7 @@ move it as far as possible in the desired direction." ;; Start resizing. (window--resize-reset frame horizontal) ;; Try to enlarge LEFT first. - (setq this-delta (window-resizable left delta horizontal)) + (setq this-delta (window--resizable left delta horizontal)) (unless (zerop this-delta) (window--resize-this-window left this-delta horizontal nil t 'before @@ -2086,7 +2071,7 @@ move it as far as possible in the desired direction." ;; Start resizing. (window--resize-reset frame horizontal) ;; Try to enlarge RIGHT. - (setq this-delta (window-resizable right (- delta) horizontal)) + (setq this-delta (window--resizable right (- delta) horizontal)) (unless (zerop this-delta) (window--resize-this-window right this-delta horizontal nil t 'after @@ -2117,7 +2102,7 @@ Return nil." ((zerop delta)) ((window-size-fixed-p nil horizontal) (error "Selected window has fixed size")) - ((window-resizable-p nil delta horizontal) + ((window--resizable-p nil delta horizontal) (window-resize nil delta horizontal)) (t (window-resize @@ -2138,7 +2123,7 @@ Return nil." ((zerop delta)) ((window-size-fixed-p nil horizontal) (error "Selected window has fixed size")) - ((window-resizable-p nil (- delta) horizontal) + ((window--resizable-p nil (- delta) horizontal) (window-resize nil (- delta) horizontal)) (t (window-resize @@ -2152,7 +2137,7 @@ Return nil." Make WINDOW as large as possible without deleting any windows. WINDOW can be any window and defaults to the selected window." (interactive) - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (window-resize window (window-max-delta window)) (window-resize window (window-max-delta window t) t)) @@ -2161,17 +2146,17 @@ WINDOW can be any window and defaults to the selected window." Make WINDOW as small as possible without deleting any windows. WINDOW can be any window and defaults to the selected window." (interactive) - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (window-resize window (- (window-min-delta window))) (window-resize window (- (window-min-delta window t)) t)) -(defsubst frame-root-window-p (window) +(defun frame-root-window-p (window) "Return non-nil if WINDOW is the root window of its frame." (eq window (frame-root-window window))) -(defun window-tree-1 (window &optional next) - "Return window tree rooted at WINDOW. -Optional argument NEXT non-nil means include windows right +(defun window--subtree (window &optional next) + "Return window subtree rooted at WINDOW. +Optional argument NEXT non-nil means include WINDOW's right siblings in the return value. See the documentation of `window-tree' for a description of the @@ -2183,10 +2168,10 @@ return value." (cond ((window-top-child window) (cons t (cons (window-edges window) - (window-tree-1 (window-top-child window) t)))) + (window--subtree (window-top-child window) t)))) ((window-left-child window) (cons nil (cons (window-edges window) - (window-tree-1 (window-left-child window) t)))) + (window--subtree (window-left-child window) t)))) (t window)) list)) (setq window (when next (window-next-sibling window)))) @@ -2202,13 +2187,13 @@ is the frame's minibuffer window. If the root window is not split, ROOT is the root window itself. Otherwise, ROOT is a list (DIR EDGES W1 W2 ...) where DIR is nil for a horizontal split, and t for a vertical split. EDGES gives -the combined size and position of the subwindows in the split, -and the rest of the elements are the subwindows in the split. -Each of the subwindows may again be a window or a list +the combined size and position of the child windows in the split, +and the rest of the elements are the child windows in the split. +Each of the child windows may again be a window or a list representing a window split, and so on. EDGES is a list \(LEFT TOP RIGHT BOTTOM) as returned by `window-edges'." (setq frame (window-normalize-frame frame)) - (window-tree-1 (frame-root-window frame) t)) + (window--subtree (frame-root-window frame) t)) (defun other-window (count &optional all-frames) "Select another window in cyclic ordering of windows. @@ -2317,7 +2302,7 @@ and no others." "Return t if WINDOW can be safely deleted from its frame. Return `frame' if deleting WINDOW should also delete its frame." - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (unless ignore-window-parameters ;; Handle atomicity. @@ -2340,13 +2325,13 @@ frame." ;; frame. t)))) -(defun window-or-subwindow-p (subwindow window) - "Return t if SUBWINDOW is either WINDOW or a subwindow of WINDOW." - (or (eq subwindow window) - (let ((parent (window-parent subwindow))) +(defun window--in-subtree-p (window root) + "Return t if WINDOW is either ROOT or a member of ROOT's subtree." + (or (eq window root) + (let ((parent (window-parent window))) (catch 'done (while parent - (if (eq parent window) + (if (eq parent root) (throw 'done t) (setq parent (window-parent parent)))))))) @@ -2367,12 +2352,12 @@ Otherwise, if WINDOW is part of an atomic window, call argument. If WINDOW is the only window on its frame or the last non-side window, signal an error." (interactive) - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (let* ((frame (window-frame window)) (function (window-parameter window 'delete-window)) (parent (window-parent window)) atom-root) - (window-check frame) + (window--check frame) (catch 'done ;; Handle window parameters. (cond @@ -2398,20 +2383,20 @@ non-side window, signal an error." (let* ((horizontal (window-left-child parent)) (size (window-total-size window horizontal)) (frame-selected - (window-or-subwindow-p (frame-selected-window frame) window)) + (window--in-subtree-p (frame-selected-window frame) window)) ;; Emacs 23 preferably gives WINDOW's space to its left ;; sibling. (sibling (or (window-left window) (window-right window)))) (window--resize-reset frame horizontal) (cond - ((and (not (window-splits window)) + ((and (not window-combination-resize) sibling (window-sizable-p sibling size)) ;; Resize WINDOW's sibling. (window--resize-this-window sibling size horizontal nil t) (set-window-new-normal sibling (+ (window-normal-size sibling horizontal) (window-normal-size window horizontal)))) - ((window-resizable-p window (- size) horizontal nil nil nil t) + ((window--resizable-p window (- size) horizontal nil nil nil t) ;; Can do without resizing fixed-size windows. (window--resize-siblings window (- size) horizontal)) (t @@ -2426,7 +2411,7 @@ non-side window, signal an error." ;; not be selected, fix this here. (other-window -1 frame)) (run-window-configuration-change-hook frame) - (window-check frame) + (window--check frame) ;; Always return nil. nil)))) @@ -2448,12 +2433,12 @@ WINDOW is a non-side window, make WINDOW the only non-side window on the frame. Side windows are not deleted. If WINDOW is a side window signal an error." (interactive) - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (let* ((frame (window-frame window)) (function (window-parameter window 'delete-other-windows)) (window-side (window-parameter window 'window-side)) atom-root side-main) - (window-check frame) + (window--check frame) (catch 'done (cond ;; Ignore window parameters if `ignore-window-parameters' is t or @@ -2477,7 +2462,7 @@ window signal an error." (unless (eq window side-main) (delete-other-windows-internal window side-main) (run-window-configuration-change-hook frame) - (window-check frame)) + (window--check frame)) ;; Always return nil. nil))) @@ -2530,7 +2515,7 @@ This may be a useful alternative binding for \\[delete-other-windows] (defun record-window-buffer (&optional window) "Record WINDOW's buffer. WINDOW must be a live window and defaults to the selected one." - (let* ((window (window-normalize-live-window window)) + (let* ((window (window-normalize-window window t)) (buffer (window-buffer window)) (entry (assq buffer (window-prev-buffers window)))) ;; Reset WINDOW's next buffers. If needed, they are resurrected by @@ -2566,7 +2551,7 @@ WINDOW must be a live window and defaults to the selected one." WINDOW must be a live window and defaults to the selected one. BUFFER must be a live buffer and defaults to the buffer of WINDOW." - (let* ((window (window-normalize-live-window window)) + (let* ((window (window-normalize-window window t)) (buffer (or buffer (window-buffer window)))) (set-window-prev-buffers window (assq-delete-all buffer (window-prev-buffers window))) @@ -2599,7 +2584,7 @@ Optional argument BURY-OR-KILL non-nil means the buffer currently shown in WINDOW is about to be buried or killed and consequently shall not be switched to in future invocations of this command." (interactive) - (let* ((window (window-normalize-live-window window)) + (let* ((window (window-normalize-window window t)) (old-buffer (window-buffer window)) ;; Save this since it's destroyed by `set-window-buffer'. (next-buffers (window-next-buffers window)) @@ -2688,7 +2673,7 @@ shall not be switched to in future invocations of this command." "In WINDOW switch to next buffer. WINDOW must be a live window and defaults to the selected one." (interactive) - (let* ((window (window-normalize-live-window window)) + (let* ((window (window-normalize-window window t)) (old-buffer (window-buffer window)) (next-buffers (window-next-buffers window)) new-buffer entry killed-buffers visible) @@ -2811,7 +2796,7 @@ Optional argument DEDICATED-ONLY non-nil means to delete WINDOW only if it's dedicated to its buffer. Optional argument KILL means the buffer shown in window will be killed. Return non-nil if WINDOW gets deleted or its frame is auto-hidden." - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) (unless (and dedicated-only (not (window-dedicated-p window))) (let* ((buffer (window-buffer window)) (deletable (window-deletable-p window))) @@ -2852,7 +2837,7 @@ displayed there." (t ;; Switch to another buffer in window. (set-window-dedicated-p nil nil) - (switch-to-prev-buffer nil 'kill))) + (switch-to-prev-buffer nil 'bury))) ;; Always return nil. nil)) @@ -2957,7 +2942,7 @@ WINDOW, \(3) restore the buffer previously displayed in WINDOW, or \(4) make WINDOW display some other buffer than the present one. If non-nil, reset `quit-restore' parameter to nil." (interactive "P") - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) (let* ((buffer (window-buffer window)) (quit-restore (window-parameter window 'quit-restore)) (prev-buffer @@ -2985,7 +2970,6 @@ one. If non-nil, reset `quit-restore' parameter to nil." (setq resize (with-current-buffer buffer (and temp-buffer-resize-mode (/= (nth 3 quad) (window-total-size window))))) - (unrecord-window-buffer window buffer) (set-window-dedicated-p window nil) (when resize ;; Try to resize WINDOW to its old height but don't signal an @@ -2993,9 +2977,12 @@ one. If non-nil, reset `quit-restore' parameter to nil." (condition-case nil (window-resize window (- (nth 3 quad) (window-total-size window))) (error nil))) - ;; Restore WINDOW's previous buffer, window start and point. + ;; Restore WINDOW's previous buffer, start and point position. (set-window-buffer-start-and-point window (nth 0 quad) (nth 1 quad) (nth 2 quad)) + ;; Unrecord WINDOW's buffer here (Bug#9937) to make sure it's not + ;; re-recorded by `set-window-buffer'. + (unrecord-window-buffer window buffer) ;; Reset the quit-restore parameter. (set-window-parameter window 'quit-restore nil) ;; Select old window. @@ -3036,7 +3023,7 @@ showing BUFFER-OR-NAME." (unrecord-window-buffer window buffer))))) ;;; Splitting windows. -(defsubst window-split-min-size (&optional horizontal) +(defun window-split-min-size (&optional horizontal) "Return minimum height of any window when splitting windows. Optional argument HORIZONTAL non-nil means return minimum width." (if horizontal @@ -3087,7 +3074,7 @@ window, these properties as well as the buffer displayed in the new window are inherited from the window selected on WINDOW's frame. The selected window is not changed by this function." (interactive "i") - (setq window (window-normalize-any-window window)) + (setq window (window-normalize-window window)) (let* ((side (cond ((not side) 'below) ((memq side '(below above right left)) side) @@ -3097,12 +3084,12 @@ frame. The selected window is not changed by this function." (parent (window-parent window)) (function (window-parameter window 'split-window)) (window-side (window-parameter window 'window-side)) - ;; Rebind `window-nest' since in some cases we may have to - ;; override its value. - (window-nest window-nest) + ;; Rebind `window-combination-limit' since in some cases we may + ;; have to override its value. + (window-combination-limit window-combination-limit) atom-root) - (window-check frame) + (window--check frame) (catch 'done (cond ;; Ignore window parameters if either `ignore-window-parameters' @@ -3112,8 +3099,8 @@ frame. The selected window is not changed by this function." ;; The `split-window' parameter specifies the function to call. ;; If that function is `ignore', do nothing. (throw 'done (funcall function window size side))) - ;; If WINDOW is a subwindow of an atomic window, split the root - ;; window of that atomic window instead. + ;; If WINDOW is part of an atomic window, split the root window + ;; of that atomic window instead. ((and (window-parameter window 'window-atom) (setq atom-root (window-atom-root window)) (not (eq atom-root window))) @@ -3123,15 +3110,15 @@ frame. The selected window is not changed by this function." (or (not parent) (not (window-parameter parent 'window-side)))) ;; WINDOW is a side root window. To make sure that a new parent - ;; window gets created set `window-nest' to t. - (setq window-nest t)) + ;; window gets created set `window-combination-limit' to t. + (setq window-combination-limit t)) - (when (and window-splits size (> size 0)) - ;; If `window-splits' is non-nil and SIZE is a non-negative - ;; integer, we cannot reasonably resize other windows. Rather - ;; bind `window-nest' to t to make sure that subsequent window - ;; deletions are handled correctly. - (setq window-nest t)) + (when (and window-combination-resize size (> size 0)) + ;; If `window-combination-resize' is non-nil and SIZE is a + ;; non-negative integer, we cannot reasonably resize other + ;; windows. Rather bind `window-combination-limit' to t to make + ;; sure that subsequent window deletions are handled correctly. + (setq window-combination-limit t)) (let* ((parent-size ;; `parent-size' is the size of WINDOW's parent, provided @@ -3140,7 +3127,7 @@ frame. The selected window is not changed by this function." ;; `resize' non-nil means we are supposed to resize other ;; windows in WINDOW's combination. (resize - (and window-splits (not window-nest) + (and window-combination-resize (not window-combination-limit) ;; Resize makes sense in iso-combinations only. (window-combined-p window horizontal))) ;; `old-size' is the current size of WINDOW. @@ -3220,7 +3207,8 @@ frame. The selected window is not changed by this function." ;; Make new-parent non-nil if we need a new parent window; ;; either because we want to nest or because WINDOW is not ;; iso-combined. - (or window-nest (not (window-combined-p window horizontal)))) + (or window-combination-limit + (not (window-combined-p window horizontal)))) (setq new-normal ;; Make new-normal the normal size of the new window. (cond @@ -3235,7 +3223,7 @@ frame. The selected window is not changed by this function." ;; we won't be able to return space to those windows when we ;; delete the one we create here. Hence we do not go up. (progn - (window--resize-subwindows parent (- new-size) horizontal) + (window--resize-child-windows parent (- new-size) horizontal) (let* ((normal (- 1.0 new-normal)) (sub (window-child parent))) (while sub @@ -3256,7 +3244,7 @@ frame. The selected window is not changed by this function." (set-window-parameter new 'window-side window-side)) (run-window-configuration-change-hook frame) - (window-check frame) + (window--check frame) ;; Always return the new window. new))))) @@ -3351,8 +3339,8 @@ right, if any." ;;; Balancing windows. ;; The following routine uses the recycled code from an old version of -;; `window--resize-subwindows'. It's not very pretty, but coding it the way the -;; new `window--resize-subwindows' code does would hardly make it any shorter or +;; `window--resize-child-windows'. It's not very pretty, but coding it the way the +;; new `window--resize-child-windows' code does would hardly make it any shorter or ;; more readable (FWIW we'd need three loops - one to calculate the ;; minimum sizes per window, one to enlarge or shrink windows until the ;; new parent-size matches, and one where we shrink the largest/enlarge @@ -3381,14 +3369,14 @@ is non-nil." (setq failed nil) (setq sub first) (while (and sub (not failed)) - ;; Ignore subwindows that should be ignored or are stuck. - (unless (window--resize-subwindows-skip-p sub) + ;; Ignore child windows that should be ignored or are stuck. + (unless (window--resize-child-windows-skip-p sub) (setq found t) (setq sub-total (window-total-size sub horizontal)) (setq sub-delta (- size sub-total)) (setq sub-amount (window-sizable sub sub-delta horizontal)) - ;; Register the new total size for this subwindow. + ;; Register the new total size for this child window. (set-window-new-total sub (+ sub-total sub-amount)) (unless (= sub-amount sub-delta) (setq total-sum (- total-sum sub-total sub-amount)) @@ -3403,7 +3391,7 @@ is non-nil." ;; (column) until `rest' is zero. (setq sub first) (while (and sub (> rest 0)) - (unless (window--resize-subwindows-skip-p window) + (unless (window--resize-child-windows-skip-p window) (set-window-new-total sub 1 t) (setq rest (1- rest))) (setq sub (window-right sub))) @@ -3425,7 +3413,7 @@ is non-nil." (window-total-size sub horizontal) (window-new-total sub)) (float parent-size))) - ;; Recursively balance each subwindow's subwindows. + ;; Recursively balance each window's child windows. (balance-windows-1 sub horizontal) (setq sub (window-right sub))))) @@ -3442,11 +3430,11 @@ is non-nil." (setq sub (window-right sub)))))))) (defun balance-windows (&optional window-or-frame) - "Balance the sizes of subwindows of WINDOW-OR-FRAME. + "Balance the sizes of windows of WINDOW-OR-FRAME. WINDOW-OR-FRAME is optional and defaults to the selected frame. If WINDOW-OR-FRAME denotes a frame, balance the sizes of all -subwindows of that frame's root window. If WINDOW-OR-FRAME -denots a window, balance the sizes of all subwindows of that +windows of that frame. If WINDOW-OR-FRAME denotes a window, +recursively balance the sizes of all child windows of that window." (interactive) (let* ((window @@ -3579,10 +3567,6 @@ specific buffers." )) ;;; Window states, how to get them and how to put them in a window. -(defsubst window-list-no-nils (&rest args) - "Like LIST but do not add nil elements of ARGS." - (delq nil (apply 'list args))) - (defvar window-state-ignored-parameters '(quit-restore) "List of window parameters ignored by `window-state-get'.") @@ -3596,46 +3580,46 @@ specific buffers." (buffer (window-buffer window)) (selected (eq window (selected-window))) (head - (window-list-no-nils - type - (unless (window-next-sibling window) (cons 'last t)) - (cons 'total-height (window-total-size window)) - (cons 'total-width (window-total-size window t)) - (cons 'normal-height (window-normal-size window)) - (cons 'normal-width (window-normal-size window t)) - (cons 'splits (window-splits window)) - (cons 'nest (window-nest window)) - (let (list) - (dolist (parameter (window-parameters window)) - (unless (memq (car parameter) - window-state-ignored-parameters) - (setq list (cons parameter list)))) - (unless (window-parameter window 'clone-of) - ;; Make a clone-of parameter. - (setq list (cons (cons 'clone-of window) list))) - (when list - (cons 'parameters list))) - (when buffer - ;; All buffer related things go in here - make the buffer - ;; current when retrieving `point' and `mark'. - (with-current-buffer (window-buffer window) - (let ((point (window-point-1 window)) - (start (window-start window)) - (mark (mark))) - (window-list-no-nils - 'buffer (buffer-name buffer) - (cons 'selected selected) - (when window-size-fixed (cons 'size-fixed window-size-fixed)) - (cons 'hscroll (window-hscroll window)) - (cons 'fringes (window-fringes window)) - (cons 'margins (window-margins window)) - (cons 'scroll-bars (window-scroll-bars window)) - (cons 'vscroll (window-vscroll window)) - (cons 'dedicated (window-dedicated-p window)) - (cons 'point (if markers (copy-marker point) point)) - (cons 'start (if markers (copy-marker start) start)) - (when mark - (cons 'mark (if markers (copy-marker mark) mark))))))))) + `(,type + ,@(unless (window-next-sibling window) `((last . t))) + (total-height . ,(window-total-size window)) + (total-width . ,(window-total-size window t)) + (normal-height . ,(window-normal-size window)) + (normal-width . ,(window-normal-size window t)) + (combination-limit . ,(window-combination-limit window)) + ,@(let (list) + (dolist (parameter (window-parameters window)) + (unless (memq (car parameter) + window-state-ignored-parameters) + (setq list (cons parameter list)))) + (unless (window-parameter window 'clone-of) + ;; Make a clone-of parameter. + (setq list (cons (cons 'clone-of window) list))) + (when list + `((parameters . ,list)))) + ,@(when buffer + ;; All buffer related things go in here - make the buffer + ;; current when retrieving `point' and `mark'. + (with-current-buffer (window-buffer window) + (let ((point (window-point-1 window)) + (start (window-start window)) + (mark (mark))) + `((buffer + ,(buffer-name buffer) + (selected . ,selected) + ,@(when window-size-fixed + `((size-fixed . ,window-size-fixed))) + (hscroll . ,(window-hscroll window)) + (fringes . ,(window-fringes window)) + (margins . ,(window-margins window)) + (scroll-bars . ,(window-scroll-bars window)) + (vscroll . ,(window-vscroll window)) + (dedicated . ,(window-dedicated-p window)) + (point . ,(if markers (copy-marker point) point)) + (start . ,(if markers (copy-marker start) start)) + ,@(when mark + `((mark . ,(if markers + (copy-marker mark) mark))))))))))) (tail (when (memq type '(vc hc)) (let (list) @@ -3661,26 +3645,25 @@ to put the state recorded here into an arbitrary window. The value can be also stored on disk and read back in a new session." (setq window (if window - (if (window-any-p window) + (if (window-valid-p window) window (error "%s is not a live or internal window" window)) (frame-root-window))) ;; The return value is a cons whose car specifies some constraints on - ;; the size of WINDOW. The cdr lists the states of the subwindows of - ;; WINDOW. + ;; the size of WINDOW. The cdr lists the states of the child windows + ;; of WINDOW. (cons ;; Frame related things would go into a function, say `frame-state', ;; calling `window-state-get' to insert the frame's root window. - (window-list-no-nils - (cons 'min-height (window-min-size window)) - (cons 'min-width (window-min-size window t)) - (cons 'min-height-ignore (window-min-size window nil t)) - (cons 'min-width-ignore (window-min-size window t t)) - (cons 'min-height-safe (window-min-size window nil 'safe)) - (cons 'min-width-safe (window-min-size window t 'safe)) - ;; These are probably not needed. - (when (window-size-fixed-p window) (cons 'fixed-height t)) - (when (window-size-fixed-p window t) (cons 'fixed-width t))) + `((min-height . ,(window-min-size window)) + (min-width . ,(window-min-size window t)) + (min-height-ignore . ,(window-min-size window nil t)) + (min-width-ignore . ,(window-min-size window t t)) + (min-height-safe . ,(window-min-size window nil 'safe)) + (min-width-safe . ,(window-min-size window t 'safe)) + ;; These are probably not needed. + ,@(when (window-size-fixed-p window) `((fixed-height . t))) + ,@(when (window-size-fixed-p window t) `((fixed-width . t)))) (window-state-get-1 window markers))) (defvar window-state-put-list nil @@ -3728,9 +3711,11 @@ value can be also stored on disk and read back in a new session." window-safe-min-width))) (if (window-sizable-p window (- size) horizontal 'safe) - (let* ((window-nest (assq 'nest item))) - ;; We must inherit the nesting, otherwise we might mess - ;; up handling of atomic and side window. + (let* ((window-combination-limit + (assq 'combination-limit item))) + ;; We must inherit the combiantion limit, otherwise + ;; we might mess up handling of atomic and side + ;; window. (setq new (split-window window size horizontal))) ;; Give up if we can't resize window down to safe sizes. (error "Cannot resize window %s" window)) @@ -3754,11 +3739,11 @@ value can be also stored on disk and read back in a new session." (dolist (item window-state-put-list) (let ((window (car item)) (splits (cdr (assq 'splits item))) - (nest (cdr (assq 'nest item))) + (combination-limit (cdr (assq 'combination-limit item))) (parameters (cdr (assq 'parameters item))) (state (cdr (assq 'buffer item)))) - (when splits (set-window-splits window splits)) - (when nest (set-window-nest window nest)) + (when combination-limit + (set-window-combination-limit window combination-limit)) ;; Process parameters. (when parameters (dolist (parameter parameters) @@ -3784,13 +3769,13 @@ value can be also stored on disk and read back in a new session." (let ((delta (- (cdr (assq 'total-height item)) (window-total-height window))) window-size-fixed) - (when (window-resizable-p window delta) + (when (window--resizable-p window delta) (window-resize window delta))) ;; Else check whether the window is not high enough. (let* ((min-size (window-min-size window nil ignore)) (delta (- min-size (window-total-size window)))) (when (and (> delta 0) - (window-resizable-p window delta nil ignore)) + (window--resizable-p window delta nil ignore)) (window-resize window delta nil ignore)))) ;; Adjust horizontally. (if (memq window-size-fixed '(t width)) @@ -3798,13 +3783,13 @@ value can be also stored on disk and read back in a new session." (let ((delta (- (cdr (assq 'total-width item)) (window-total-width window))) window-size-fixed) - (when (window-resizable-p window delta) + (when (window--resizable-p window delta) (window-resize window delta))) ;; Else check whether the window is not wide enough. (let* ((min-size (window-min-size window t ignore)) (delta (- min-size (window-total-size window t)))) (when (and (> delta 0) - (window-resizable-p window delta t ignore)) + (window--resizable-p window delta t ignore)) (window-resize window delta t ignore)))) ;; Set dedicated status. (set-window-dedicated-p window (cdr (assq 'dedicated state))) @@ -3829,9 +3814,9 @@ specify a live window and defaults to the selected one. Optional argument IGNORE non-nil means ignore minimum window sizes and fixed size restrictions. IGNORE equal `safe' means -subwindows can get as small as `window-safe-min-height' and +windows can get as small as `window-safe-min-height' and `window-safe-min-width'." - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) (let* ((frame (window-frame window)) (head (car state)) ;; We check here (1) whether the total sizes of root window of @@ -3845,7 +3830,7 @@ subwindows can get as small as `window-safe-min-height' and (cdr (assq 'total-width state))))) (min-height (cdr (assq 'min-height head))) (min-width (cdr (assq 'min-width head))) - window-splits selected) + selected) (if (and (not totals) (or (> min-height (window-total-size window)) (> min-width (window-total-size window t))) @@ -3880,7 +3865,7 @@ subwindows can get as small as `window-safe-min-height' and (set-window-buffer window (current-buffer)) (window-state-put-1 state window nil totals) (window-state-put-2 ignore)) - (window-check frame)))) + (window--check frame)))) (defun display-buffer-record-window (type window buffer) "Record information for window used by `display-buffer'. @@ -3934,8 +3919,9 @@ means that the currently selected window is not acceptable. It should choose or create a window, display the specified buffer in it, and return the window. -The function specified here is responsible for setting the -quit-restore and help-setup parameters of the window used." +The specified function should call `display-buffer-record-window' +with corresponding arguments to set up the quit-restore parameter +of the window used." :type '(choice (const nil) (function :tag "function")) @@ -4188,6 +4174,7 @@ and (cdr ARGS) as second." (make-frame (append args special-display-frame-alist)))) (window (frame-selected-window frame))) (display-buffer-record-window 'frame window buffer) + ;; FIXME: Use window--display-buffer-2? (set-window-buffer window buffer) ;; Reset list of WINDOW's previous buffers to nil. (set-window-prev-buffers window nil) @@ -4207,8 +4194,9 @@ A buffer is special when its name is either listed in `special-display-buffer-names' or matches a regexp in `special-display-regexps'. -The function specified here is responsible for setting the -quit-restore and help-setup parameters of the window used." +The specified function should call `display-buffer-record-window' +with corresponding arguments to set up the quit-restore parameter +of the window used." :type 'function :group 'frames) @@ -4608,9 +4596,8 @@ See `display-buffer' for details." :group 'windows) (defconst display-buffer-fallback-action - '((display-buffer--maybe-same-window + '((display-buffer--maybe-same-window ;FIXME: why isn't this redundant? display-buffer-reuse-window - display-buffer--special display-buffer--maybe-pop-up-frame-or-window display-buffer-use-some-window ;; If all else fails, pop up a new frame. @@ -4641,7 +4628,6 @@ specified, e.g. by the user options `display-buffer-alist' or (defvar display-buffer--other-frame-action '((display-buffer-reuse-window - display-buffer--special display-buffer-pop-up-frame) (reusable-frames . 0) (inhibit-same-window . t)) @@ -4707,6 +4693,7 @@ search for a window that is already displaying the buffer. See (let* ((user-action (display-buffer-assq-regexp (buffer-name buffer) display-buffer-alist)) + (special-action (display-buffer--special-action buffer)) ;; Extra actions from the arguments to this function: (extra-action (cons nil (append (if inhibit-same-window @@ -4715,7 +4702,7 @@ search for a window that is already displaying the buffer. See `((reusable-frames . ,frame)))))) ;; Construct action function list and action alist. (actions (list display-buffer-overriding-action - user-action action extra-action + user-action special-action action extra-action display-buffer-base-action display-buffer-fallback-action)) (functions (apply 'append @@ -4798,7 +4785,7 @@ terminal if either of those variables is non-nil." (display-buffer-record-window 'reuse window buffer) (window--display-buffer-1 window)))) -(defun display-buffer--special (buffer alist) +(defun display-buffer--special-action (buffer) "Try to display BUFFER using `special-display-function'. Call `special-display-p' on BUFFER's name, and if that returns non-nil, call `special-display-function' on BUFFER." @@ -4807,8 +4794,10 @@ non-nil, call `special-display-function' on BUFFER." ;; parameters to pass to `special-display-function'. (let ((pars (special-display-p (buffer-name buffer)))) (when pars - (funcall special-display-function - buffer (if (listp pars) pars)))))) + (list (list #'display-buffer-reuse-window + `(lambda (buffer _alist) + (funcall special-display-function + buffer ',(if (listp pars) pars))))))))) (defun display-buffer-pop-up-frame (buffer alist) "Display BUFFER in a new frame. @@ -4956,8 +4945,7 @@ the buffer. NORECORD, if non-nil means do not put this buffer at the front of the list of recently selected ones." (pop-to-buffer buffer - '((display-buffer--special - display-buffer-same-window) + '(display-buffer-same-window (inhibit-same-window . nil)) norecord)) @@ -5022,7 +5010,7 @@ nil, BUFFER-OR-NAME may be displayed in another window. Return the buffer switched to." (interactive - (list (read-buffer-to-switch "Switch to buffer: ") nil nil)) + (list (read-buffer-to-switch "Switch to buffer: ") nil 'force-same-window)) (let ((buffer (window-normalize-buffer-to-switch-to buffer-or-name))) (if (null force-same-window) (pop-to-buffer buffer display-buffer--same-window-action norecord) @@ -5097,7 +5085,7 @@ Note that the current implementation of this function cannot always set the height exactly, but attempts to be conservative, by allocating more lines than are actually needed in the case where some error may be present." - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) (let ((delta (- height (window-text-height window)))) (unless (zerop delta) ;; Setting window-min-height to a value like 1 can lead to very @@ -5193,7 +5181,7 @@ WINDOW was scrolled." (interactive) ;; Do all the work in WINDOW and its buffer and restore the selected ;; window and the current buffer when we're done. - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) ;; Can't resize a full height or fixed-size window. (unless (or (window-size-fixed-p window) (window-full-height-p window)) @@ -5299,7 +5287,7 @@ window, or if the window is the only window of its frame. Return non-nil if the window was shrunk, nil otherwise." (interactive) - (setq window (window-normalize-live-window window)) + (setq window (window-normalize-window window t)) ;; Make sure that WINDOW is vertically combined and `point-min' is ;; visible (for whatever reason that's needed). The remaining issues ;; should be taken care of by `fit-window-to-buffer'. @@ -5421,12 +5409,12 @@ by `recenter-positions'." ;;; Scrolling commands. -;;; Scrolling commands which does not signal errors at top/bottom -;;; of buffer at first key-press (instead moves to top/bottom +;;; Scrolling commands which do not signal errors at top/bottom +;;; of buffer at first key-press (instead move to top/bottom ;;; of buffer). (defcustom scroll-error-top-bottom nil - "Move point to top/bottom of buffer before signalling a scrolling error. + "Move point to top/bottom of buffer before signaling a scrolling error. A value of nil means just signal an error if no more scrolling possible. A value of t means point moves to the beginning or the end of the buffer \(depending on scrolling direction) when no more scrolling possible. diff --git a/lisp/woman.el b/lisp/woman.el index 7b530d1004f..a16bfa39c86 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1439,8 +1439,8 @@ The cdr of each alist element is the path-index / filename." (push (woman-topic-all-completions-1 dir path-index) files)) (setq path-index (1+ path-index))) - ;; Uniquefy topics: - ;; Concate all lists with a single nconc call to + ;; Uniquify topics: + ;; Concatenate all lists with a single nconc call to ;; avoid retraversing the first lists repeatedly -- dak (woman-topic-all-completions-merge (apply #'nconc files)))) @@ -2023,7 +2023,7 @@ Optional argument REDRAW, if non-nil, forces mode line to be updated." ;; Both advices are disabled because "a file in Emacs should not put ;; advice on a function in Emacs" (see Info node "(elisp)Advising ;; Functions"). Counting the formatting time is useful for -;; developping, but less applicable for daily use. The advice for +;; developing, but less applicable for daily use. The advice for ;; `Man-getpage-in-background' can be discarded, because the ;; key-binding in `woman-mode-map' has been remapped to call `woman' ;; but `man'. Michael Albinus <michael.albinus@gmx.de> diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el index 04b759a8116..fbb76da1b91 100644 --- a/lisp/x-dnd.el +++ b/lisp/x-dnd.el @@ -410,7 +410,7 @@ otherwise return the frame width/height." "Return the x/y coordinates to be sent in a XDndStatus message. Coordinates are required to be absolute. FRAME is the frame and W is the window where the drop happened. -If W is a window, return its absolute corrdinates, +If W is a window, return its absolute coordinates, otherwise return the frame coordinates." (let* ((frame-left (frame-parameter frame 'left)) ;; If the frame is outside the display, frame-left looks like @@ -444,7 +444,7 @@ otherwise return the frame coordinates." (if (consp flags) (logand (cdr flags) 1) (logand flags 1))) - + (defun x-dnd-handle-xdnd (event frame window message _format data) "Receive one XDND event (client message) and send the appropriate reply. EVENT is the client message. FRAME is where the mouse is now. diff --git a/lisp/xml.el b/lisp/xml.el index 52bb0de7ea0..68aa5f4db6f 100644 --- a/lisp/xml.el +++ b/lisp/xml.el @@ -540,7 +540,7 @@ Leave point at the first non-blank character after the tag." (replace-regexp-in-string "\\s-\\{2,\\}" " " string) (let ((expansion (xml-substitute-special string))) (unless (stringp expansion) - ; We say this is the constraint. It is acctually that + ; We say this is the constraint. It is actually that neither ; external entities nor "<" can be in an attribute value. (error "XML: (Not Well-Formed) Entities in attributes cannot expand into elements")) (push (cons name expansion) attlist))) diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c index 5ed33d5be05..977f4a70b22 100644 --- a/lwlib/xlwmenu.c +++ b/lwlib/xlwmenu.c @@ -1486,7 +1486,7 @@ remap_menubar (XlwMenuWidget mw) if (new_selection && !new_selection->enabled) new_selection = NULL; - /* Call callback when the hightlighted item changes. */ + /* Call callback when the highlighted item changes. */ if (old_selection || new_selection) XtCallCallbackList ((Widget)mw, mw->menu.highlight, (XtPointer) new_selection); diff --git a/msdos/README b/msdos/README index 9f75d9c12bf..532d18726c6 100644 --- a/msdos/README +++ b/msdos/README @@ -60,7 +60,7 @@ This document is Copyright (C) DJ Delorie and may be distributed verbatim, but changing it is not allowed. Source code copyright DJ Delorie is distributed under the terms of the -GNU General Public Licence, with the following exceptions: +GNU General Public License, with the following exceptions: * Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and libemu.a are distributed under the terms of the GNU Library General @@ -68,7 +68,7 @@ GNU General Public Licence, with the following exceptions: * Any existing copyright or authorship information in any given source file must remain intact. If you modify a source file, a notice to that - effect must be added to the authorship information in the source file. + effect must be added to the authorship information in the source file. * Runtime binaries, as provided by DJ in DJGPP, may be distributed without sources ONLY if the recipient is given sufficient information diff --git a/nt/ChangeLog b/nt/ChangeLog index 64b9577e362..8de94033196 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,48 @@ +2011-11-15 Eli Zaretskii <eliz@gnu.org> + + * README.W32: Update the GTK Windows download URL for libpng. + +2011-11-13 Christoph Scholtes <cschol2112@googlemail.com> + + * inc/stdint.h (UINT64_MAX, UINT32_MAX): Fix values. + +2011-11-05 Christoph Scholtes <cschol2112@googlemail.com> + + * inc/stdint.h (UINT64_MAX, UINT64_MIN, INT64_MIN, UINTMAX_MAX) + (UINTMAX_MIN, INTMAX_MAX, INTMAX_MIN, UINT32_MIN, UINT32_MAX) + (INT32_MIN, UINTMAX_MAX, UINTMAX_MIN, INTMAX_MAX, INTMAX_MIN) + (intmax_t, INT64_MAX): Add for MSVC. + + * config.nt (mode_t) [!__GNUC__]: Define mode_t for MSVC. + +2011-11-05 Eli Zaretskii <eliz@gnu.org> + + * config.nt (inline) [!__GNUC__]: Define to __inline for MSVC. + + Support MSVC build with newer versions of Visual Studio. + * makefile.w32-in (clean-other-dirs-nmake) + (distclean-other-dirs-nmake, maintainer-clean-other-dirs-nmake): + Update for current structure of doc/ subdirectories. + + * gmake.defs (OBJ0_c, OBJ1_c, OBJ2_c): New variables. + + * INSTALL: Update for newer versions of MSVC. + +2011-11-05 Fabrice Popineau <fabrice.popineau@supelec.fr> (tiny change) + + Support MSVC build with newer versions of Visual Studio. + * nmake.defs (USE_CRT_DLL): Define to 1. + (libc, EMACS_EXTRA_C_FLAGS, SYS_LDFLAGS, ARCH_CFLAGS): Update values. + (D): New variable. + +2011-11-04 Eli Zaretskii <eliz@gnu.org> + + * runemacs.c (ensure_unicows_dll): New function, tries to load + UNICOWS.DLL on Windows 9X. + (WinMain): If ensure_unicows_dll fails to find UNICOWS.DLL, + display a dialog to the effect that Emacs cannot be started. + (Bug#8562) + 2011-10-28 Eli Zaretskii <eliz@gnu.org> * README.W32: Mention UNICOWS.DLL as prerequisite for running diff --git a/nt/INSTALL b/nt/INSTALL index 613610890ae..bb621dceb6b 100644 --- a/nt/INSTALL +++ b/nt/INSTALL @@ -21,19 +21,32 @@ cd nt - 2. Run configure.bat. From the COMMAND.COM/CMD.EXE command prompt: + 2. Run configure.bat. + + 2a.If you use MSVC, set up the build environment by running the + SetEnv.cmd batch file from the appropriate SDK directory. (Skip + this step if you are using MinGW.) For example: + + "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Debug + + if you are going to compile a debug version, or + + "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x86 /Release + + if you are going to compile an optimized version. + + 2b.From the COMMAND.COM/CMD.EXE command prompt type: configure - from a Unixy shell prompt: + From a Unixy shell prompt: cmd /c configure.bat or command.com /c configure.bat 3. Run the Make utility suitable for your environment. If you build - with the Microsoft's Visual C compiler (but see notes about using - VC++ 8.0 and later below): + with the Microsoft's Visual C compiler: nmake @@ -101,24 +114,21 @@ * Supported development environments To compile Emacs, you will need either Microsoft Visual C++ 2.0, or - later up to 7.0, and nmake, or a Windows port of GCC 2.95 or later - with MinGW and W32 API support and a port of GNU Make. You can use - the Cygwin ports of GCC, but Emacs requires the MinGW headers and - libraries to build (latest versions of the Cygwin toolkit, at least - since v1.3.3, include the MinGW headers and libraries as an integral - part). - - Note that building Emacs with Visual Studio 2005 (VC++ 8.0) and - later is not supported at this time, due to changes introduced by - Microsoft into the libraries shipped with the compiler. + later and nmake, or a Windows port of GCC 2.95 or later with MinGW + and W32 API support and a port of GNU Make. You can use the Cygwin + ports of GCC, but Emacs requires the MinGW headers and libraries to + build (latest versions of the Cygwin toolkit, at least since v1.3.3, + include the MinGW headers and libraries as an integral part). The rest of this file assumes you have a working development - environment. If you just installed such an environment, try + environment. If you just installed such an environment, try building a trivial C "Hello world" program, and see if it works. If it doesn't work, resolve that problem first! If you use Microsoft Visual Studio .NET 2003, don't forget to run the VCVARS32.BAT batch file from the `Bin' subdirectory of the directory where you have - installed VS.NET. + installed VS.NET. With other versions of MSVC, run the SetEnv.cmd + batch file from the `Bin' subdirectory of the directory where you + have the SDK installed. If you use the MinGW port of GCC and GNU Make to build Emacs, there are some compatibility issues wrt Make and the shell that is run by @@ -258,7 +268,7 @@ "Error in --cflags argument: ... Backslashes and quotes cannot be used with --cflags. Please use forward slashes for filenames and paths (e.g. when passing directories to -I)." - + N.B. It is normal to see a few error messages output while configure is running, when gcc support is being tested. These cannot be suppressed because of limitations in the Windows 9X command.com shell. diff --git a/nt/README.W32 b/nt/README.W32 index e4044e409d4..52582dc7ccf 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -129,7 +129,7 @@ See the end of the file for license conditions. Emacs can also support some other image formats with appropriate libraries. These libraries are all available as part of GTK - download for Windows (http://www.gtk.org/download-windows.html), or + download for Windows (http://www.gtk.org/download/win32.php), or from the GnuWin32 project. Emacs will find them if the directory they are installed in is on the PATH. @@ -142,7 +142,7 @@ See the end of the file for license conditions. the PNG support will not work, and you will have to download newer versions. - JPEG: requires the Independant JPEG Group's libjpeg 6b or later, + JPEG: requires the Independent JPEG Group's libjpeg 6b or later, which will be called jpeg62.dll, libjpeg.dll, jpeg-62.dll or jpeg.dll. TIFF: requires libTIFF 3.0 or later, which will be called libtiff3.dll diff --git a/nt/config.nt b/nt/config.nt index 87c5f5cc8aa..3a06a9f5b7a 100644 --- a/nt/config.nt +++ b/nt/config.nt @@ -328,9 +328,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ +#ifdef __GNUC__ #ifndef __cplusplus #undef inline #endif +#else /* MSVC */ +#define inline __inline +#endif /* Define to the equivalent of the C99 'restrict' keyword, or to nothing if this is not supported. Do not define if restrict is @@ -341,6 +345,11 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ # define restrict #endif +/* `mode_t' is not defined for MSVC. Define. */ +#ifdef _MSC_VER +typedef unsigned short mode_t; +#endif + /* A va_copy replacement for MSVC. */ #ifdef _MSC_VER # ifdef _WIN64 diff --git a/nt/gmake.defs b/nt/gmake.defs index bbb560264c5..a1ff7af853e 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -95,7 +95,7 @@ THISDIR = . ifdef USING_SH sh_output := $(shell echo [Please ignore a syntax error on the next line - it is intentional] 1>&2) sh_output := $(shell echo foo") -# This single quote " is to fix fintification due to previous line +# This single quote " is to fix fontification due to previous line ifeq "$(sh_output)" "" NEW_CYGWIN = 1 endif @@ -193,6 +193,11 @@ OLE32 = -lole32 UNISCRIBE = -lusp10 UUID = -luuid +# Used by src/makefile.w32-in, since Nmake barfs on $(func SOMETHING) +OBJ0_c = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0)) +OBJ1_c = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1)) +OBJ2_c = $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2)) + ifdef NOOPT DEBUG_CFLAGS = -DEMACSDEBUG else @@ -306,4 +311,3 @@ export XMFLAGS $(BLD)/%.o: %.c $(CC) $(CFLAGS) $(CC_OUT)$@ $< - diff --git a/nt/inc/stdint.h b/nt/inc/stdint.h index 4af0346af2c..fa2e06f3da9 100644 --- a/nt/inc/stdint.h +++ b/nt/inc/stdint.h @@ -27,20 +27,34 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Minimum definitions to allow compilation with tool chains where stdint.h is not available, e.g. Microsoft Visual Studio. */ -typedef unsigned int uint32_t; -#define INT32_MAX 2147483647 +#ifdef _WIN64 +typedef __int64 intptr_t; +#define UINT64_MAX 18446744073709551615 +#define UINT64_MIN 0 /* "i64" is the non-standard suffix used by MSVC for 64-bit constants. */ #define INT64_MAX 9223372036854775807i64 - -#ifdef _WIN64 - typedef __int64 intptr_t; +#define INT64_MIN (~INT64_MAX) #define INTPTR_MAX INT64_MAX +#define UINTMAX_MAX UINT64_MAX +#define UINTMAX_MIN UINT64_MIN +#define INTMAX_MAX INT64_MAX +#define INTMAX_MIN INT64_MIN #else - typedef int intptr_t; +typedef int intptr_t; +typedef unsigned int uint32_t; +#define UINT32_MAX 4294967295 +#define UINT32_MIN 0 +#define INT32_MAX 2147483647 +#define INT32_MIN (~INT32_MAX) #define INTPTR_MAX INT32_MAX +#define UINTMAX_MAX UINT32_MAX +#define UINTMAX_MIN UINT32_MIN +#define INTMAX_MAX INT32_MAX +#define INTMAX_MIN INT32_MIN #endif #define uintmax_t unsigned __int64 +#define intmax_t __int64 #define PTRDIFF_MAX INTPTR_MAX #endif /* !__GNUC__ */ diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index 05631855f6a..194f0759bbf 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -313,15 +313,15 @@ clean-other-dirs-nmake: $(MAKE) $(MFLAGS) clean
cd ..\doc\lispintro
$(MAKE) $(MFLAGS) clean
- cd ..\doc\lispref
+ cd ..\lispref
$(MAKE) $(MFLAGS) clean
- cd ..\leim
+ cd ..\..\leim
$(MAKE) $(MFLAGS) clean
cd ..\doc\emacs
$(MAKE) $(MFLAGS) clean
- cd ..\doc\misc
+ cd ..\misc
$(MAKE) $(MFLAGS) clean
- cd ..\nt
+ cd ..\..\nt
clean-other-dirs-gmake:
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean
@@ -381,13 +381,13 @@ distclean-other-dirs-nmake: $(MAKE) $(MFLAGS) distclean
cd ..\doc\emacs
$(MAKE) $(MFLAGS) distclean
- cd ..\doc\misc
+ cd ..\misc
$(MAKE) $(MFLAGS) distclean
- cd ..\doc\lispintro
+ cd ..\lispintro
$(MAKE) $(MFLAGS) distclean
- cd ..\doc\lispref
+ cd ..\lispref
$(MAKE) $(MFLAGS) distclean
- cd ..\nt
+ cd ..\..\nt
distclean-other-dirs-gmake:
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib distclean
@@ -415,13 +415,13 @@ maintainer-clean-other-dirs-nmake: $(MAKE) $(MFLAGS) maintainer-clean
cd ..\doc\emacs
$(MAKE) $(MFLAGS) maintainer-clean
- cd ..\doc\misc
+ cd ..\misc
$(MAKE) $(MFLAGS) maintainer-clean
- cd ..\doc\lispintro
+ cd ..\lispintro
$(MAKE) $(MFLAGS) maintainer-clean
- cd ..\doc\lispref
+ cd ..\lispref
$(MAKE) $(MFLAGS) maintainer-clean
- cd ..\nt
+ cd ..\..\nt
maintainer-clean-other-dirs-gmake:
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib maintainer-clean
diff --git a/nt/nmake.defs b/nt/nmake.defs index 6c0922d78b9..4a7d93d40dd 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -109,7 +109,15 @@ RC = rc RC_OUT = -Fo
RC_INCLUDE = -i
-libc = libc.lib
+USE_CRT_DLL = 1
+
+!ifdef USE_CRT_DLL
+libc = msvcrt$(D).lib
+EMACS_EXTRA_C_FLAGS= -D_DLL -D_MT -DUSE_CRT_DLL=1
+!else
+libc = libcmt$(D).lib
+EMACS_EXTRA_C_FLAGS= -D_MT
+!endif
baselibs =
O = obj
A = lib
@@ -146,9 +154,13 @@ CFLAGS = -I. $(ARCH_CFLAGS) \ $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
ESC_CFLAGS = -I. $(ARCH_CFLAGS) \
$(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS)
-EMACS_EXTRA_C_FLAGS =
-SYS_LDFLAGS = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
+#SYS_LDFLAGS = -nologo -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
+!ifdef NOOPT
+SYS_LDFLAGS = -nologo -manifest -dynamicbase:no -debug -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
+!else
+SYS_LDFLAGS = -nologo -manifest -dynamicbase:no -release -incremental:no -version:3.10 -swaprun:cd -swaprun:net setargv.obj
+!endif
# see comments in allocate_heap in w32heap.c before changing any of the
# -stack, -heap, or -base settings.
@@ -184,16 +196,20 @@ DEL_TREE = rm -r !ifdef NODEBUG
DEBUG_FLAG =
DEBUG_LINK =
+D =
!else
DEBUG_FLAG = -Zi
-DEBUG_LINK = -debug:full
+DEBUG_LINK = -debug
+D = d
!endif
!if "$(ARCH)" == "i386"
!ifdef NOOPT
-ARCH_CFLAGS = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)
+#ARCH_CFLAGS = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)
+ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zl -Zp8 -W2 -Od -Gd $(DEBUG_FLAG)
!else
-ARCH_CFLAGS = -nologo -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG)
+#ARCH_CFLAGS = -nologo -c -Zel -W2 -H63 -Oxsb2 -Oy- -G6dF -Zp8 $(DEBUG_FLAG)
+ARCH_CFLAGS = -nologo -D_X86_=1 -c -Zl -Zp8 -W2 -Oi -Ot -Oy- -Ob2 -GF -Gy -Gd $(DEBUG_FLAG)
!endif
ARCH_LDFLAGS = $(SYS_LDFLAGS)
diff --git a/nt/preprep.c b/nt/preprep.c index 6b764afdeab..7541536714c 100644 --- a/nt/preprep.c +++ b/nt/preprep.c @@ -321,7 +321,7 @@ relocate_offset (DWORD offset, variables, because of dumping.] We could potentially generate the relocation data ourselves by making - two versions of temacs, one with an extra dummmy section before + two versions of temacs, one with an extra dummy section before EMHEAP to offset it, and then compare the dumped executables from both. That is a lot of work though, and it doesn't solve the problem of dumped pointers to static variables, which also can be relocated. @@ -825,4 +825,3 @@ main (int argc, char **argv) } /* eof */ - diff --git a/nt/runemacs.c b/nt/runemacs.c index 07e24f745f8..47b8f54bb02 100644 --- a/nt/runemacs.c +++ b/nt/runemacs.c @@ -45,6 +45,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include <malloc.h> static void set_user_model_id (void); +static int ensure_unicows_dll (void); int WINAPI WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) @@ -59,6 +60,9 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) char *p; char modname[MAX_PATH]; + if (!ensure_unicows_dll ()) + goto error; + set_user_model_id (); if (!GetModuleFileName (NULL, modname, MAX_PATH)) @@ -203,3 +207,43 @@ set_user_model_id (void) } } +static int +ensure_unicows_dll (void) +{ + OSVERSIONINFO os_ver; + HMODULE h; + + ZeroMemory (&os_ver, sizeof (OSVERSIONINFO)); + os_ver.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); + if (!GetVersionEx (&os_ver)) + return 0; + + if (os_ver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) + { + h = LoadLibrary ("Unicows.dll"); + if (!h) + { + int button; + + button = MessageBox (NULL, + "Emacs cannot load the UNICOWS.DLL library.\n" + "This library is essential for using Emacs\n" + "on this system. You need to install it.\n\n" + "However, you can still use Emacs by invoking\n" + "it with the '-nw' command-line option.\n\n" + "Emacs will exit when you click OK.", + "Emacs cannot load UNICOWS.DLL", + MB_ICONERROR | MB_TASKMODAL + | MB_SETFOREGROUND | MB_OK); + switch (button) + { + case IDOK: + default: + return 0; + } + } + FreeLibrary (h); + return 1; + } + return 1; +} diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index b40b5ca7084..5d04eea75d4 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -167,7 +167,7 @@ 2007-02-25 Glenn Morris <rgm@gnu.org> * XCrAssoc.c, XDelAssoc.c, XDestAssoc.c, XLookAssoc.c: - * XMakeAssoc.c: Remove license text in favour of including + * XMakeAssoc.c: Remove license text in favor of including copyright.h, as was done in original X11 source. 2004-12-27 Jan Djärv <jan.h.d@swipnet.se> diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c index 102de9d7a56..a779cda82f5 100644 --- a/oldXMenu/Internal.c +++ b/oldXMenu/Internal.c @@ -968,7 +968,7 @@ _XMRefreshSelection(register Display *display, register XMenu *menu, register XM /* * Using BOX mode. * Since most drawing routines with arbitrary width lines - * are slow compared to raster-ops lets use a raster-op to + * are slow compared to raster-ops let's use a raster-op to * draw the boxes. */ diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h index bf1e77b5ff7..aa27211c05c 100644 --- a/oldXMenu/XMenu.h +++ b/oldXMenu/XMenu.h @@ -185,7 +185,7 @@ typedef struct _xmenu { Window parent; /* Menu's parent window. */ int width; /* Overall menu width. */ int height; /* Overall menu height. */ - int x_pos; /* Oveall menu origin. */ + int x_pos; /* Overall menu origin. */ int y_pos; /* Overall menu origin. */ Cursor mouse_cursor; /* Mouse cursor raster. */ XAssocTable *assoc_tab; /* XMWindow association table. */ diff --git a/src/ChangeLog b/src/ChangeLog index eb71bfc62ed..4cec277fb36 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,4 @@ -2011-11-02 Paul Eggert <eggert@cs.ucla.edu> +2011-11-18 Paul Eggert <eggert@cs.ucla.edu> Fix integer width and related bugs (Bug#9874). * alloc.c (pure_bytes_used_lisp, pure_bytes_used_non_lisp): @@ -786,6 +786,364 @@ rather than rolling our own approximation. (SCROLL_BAR_VEC_SIZE): Remove; not used. +2011-11-18 Paul Eggert <eggert@cs.ucla.edu> + + Fix minor problems found by static checking. + * dispextern.h, xdisp.c (row_hash): Declare extern only if XASSERTS. + * dispnew.c (verify_row_hash): Now static. + +2011-11-18 Dmitry Antipov <dmantipov@yandex.ru> + + * keymap.c (Fwhere_is_internal): Add missing RETURN_UNGCPROs. + +2011-11-18 Stefan Monnier <monnier@iro.umontreal.ca> + + * intervals.c: Fix grafting over the whole buffer (bug#10071). + (graft_intervals_into_buffer): Simplify. + +2011-11-18 Eli Zaretskii <eliz@gnu.org> + + * dispnew.c (swap_glyph_pointers): Swap the used[] arrays and the + hash values of the two rows. + (copy_row_except_pointers): Preserve the used[] arrays and the + hash values of the two rows. (Bug#10035) + (add_row_entry): Add xassert to verify that ROW's hash code is valid. + + * xdisp.c (row_hash): New function, body extracted from + compute_line_metrics. + (compute_line_metrics): Call row_hash, instead of computing the + hash code inline. + + * dispnew.c (verify_row_hash): Call row_hash for computing the + hash code of a row, instead of duplicating code from xdisp.c. + + * dispextern.h (row_hash): Add prototype. + +2011-11-18 Tassilo Horn <tassilo@member.fsf.org> + + * frame.c (delete_frame): Don't delete the terminal when the last + X frame is closed if emacs is built with GTK toolkit. + +2011-11-17 Juanma Barranquero <lekktu@gmail.com> + + * window.c (syms_of_window) <window-combination-resize>: Fix typo. + +2011-11-17 Martin Rudalics <rudalics@gmx.at> + + * window.c (Vwindow_splits): Rename to + Vwindow_combination_resize. Suggested by Juri Linkov. + (Fsplit_window_internal): Use Vwindow_combination_resize instead + of Vwindow_splits. + +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * nsfns.m (Fns_font_name): + * window.c (syms_of_window) <window-combination-limit>: Fix typos. + +2011-11-16 Martin Rudalics <rudalics@gmx.at> + + * window.h (window): Rename slot "nest" to "combination_limit". + * window.c (Fwindow_nest): Rename to Fwindow_combination_limit. + (Fset_window_nest): Rename to Fset_window_combination_limit. + (Vwindow_nest): Rename to Vwindow_combination_limit. + (recombine_windows, make_parent_window, make_window) + (Fsplit_window_internal, saved_window) + (Fset_window_configuration, save_window_save): Rename all + occurrences of window_nest to window_combination_limit. + +2011-11-15 Juanma Barranquero <lekktu@gmail.com> + + * image.c (imagemagick_load_image): Fix typo. + +2011-11-14 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (display_line): Move the call to + highlight_trailing_whitespace before the call to + compute_line_metrics, since the latter needs to see the final + faces of all the glyphs to compute ROW's hash value. Fixes + assertion violations in row_equal_p. (Bug#10035) + +2011-11-14 Juanma Barranquero <lekktu@gmail.com> + + * w32proc.c (reader_thread): Don't check pending input if cp->fd < 0, + just return (bug#10044). + +2011-11-12 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs + with user-defined heap size. Bump the default size of the temacs + heap to 27MB, to avoid memory warning when running temacs. + ($(TEMACS)): Use HEAPSIZE instead of a hardcoded value. + + * dispnew.c (scrolling_window): Fix incorrect indices in accessing + current_matrix and desired_matrix. (Bug#9990) + (verify_row_hash) [XASSERTS]: New function. + (adjust_glyph_matrix, row_equal_p): Use it in xassert to verify + that the hash value of glyph rows is correct. + +2011-11-12 Martin Rudalics <rudalics@gmx.at> + + * window.h (window): Remove splits slot. + * window.c (Fwindow_splits, Fset_window_splits): Remove. + (Fdelete_other_windows_internal, make_parent_window) + (make_window, Fsplit_window_internal, Fdelete_window_internal) + (Fset_window_configuration, save_window_save): Don't deal with + split status of windows. + (saved_window): Remove splits slot. + (Vwindow_splits): Rewrite doc-string. + +2011-11-11 Jan Djärv <jan.h.d@swipnet.se> + + * xfns.c (unwind_create_frame): + * nsfns.m (unwind_create_frame): + * w32fns.c (unwind_create_frame): Use Fmemq to check if frame is in + Vframe_list (Bug#9999). + +2011-11-11 Dmitry Antipov <dmantipov@yandex.ru> + + * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. + +2011-11-11 Kenichi Handa <handa@m17n.org> + + * callproc.c (Fcall_process): Set the member dst_multibyte of + process_coding. + +2011-11-11 Johan Bockgård <bojohan@gnu.org> + + * xdisp.c (fill_composite_glyph_string): Always set s->face, to + avoid a crash (bug#9496). + +2011-11-09 Chong Yidong <cyd@gnu.org> + + * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges) + (Fwindow_inside_absolute_pixel_edges): Only allow live windows. + +2011-11-08 Paul Eggert <eggert@cs.ucla.edu> + + * s/gnu.h (GC_MARK_STACK): Define to GC_MAKE_GCPROS_NOOPS (Bug#9926). + +2011-11-08 Paul Eggert <eggert@cs.ucla.edu> + + Avoid some portability problems by eschewing 'extern inline' functions. + The trivial performance wins aren't worth the portability hassles; see + <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html> + et seq. + * dispextern.h (window_box, window_box_height, window_text_bottom_y) + (window_box_width, window_box_left, window_box_left_offset) + (window_box_right, window_box_right_offset): Undo previous change, + by removing the "extern"s. + * intervals.c (adjust_intervals_for_insertion) + (adjust_intervals_for_deletion): Undo previous change, + making these static again. + (offset_intervals, temp_set_point_both, temp_set_point) + (copy_intervals_to_string): No longer inline. + * xdisp.c (window_text_bottom_y, window_box_width) + (window_box_height, window_box_left_offset) + (window_box_right_offset, window_box_left, window_box_right) + (window_box): No longer inline. + +2011-11-08 Chong Yidong <cyd@gnu.org> + + * window.c (Fwindow_left_column, Fwindow_top_line): Doc fix. + (Fwindow_body_height, Fwindow_body_width): Move from Lisp. Signal + an error if not a live window. + (Fwindow_total_width, Fwindow_total_height): Move from Lisp. + (Fwindow_total_size, Fwindow_body_size): Move to Lisp. + +2011-11-07 Juanma Barranquero <lekktu@gmail.com> + + * lisp.h (syms_of_abbrev): Remove declaration. + Reported by CHENG Gao <chenggao@royau.me>. + +2011-11-07 Eli Zaretskii <eliz@gnu.org> + + * w32.c (check_windows_init_file): Don't look for term/w32-win.el + if Vpurify_flag is non-nil. Fixes a crash when running w32 build + of temacs in GUI mode. + +2011-11-07 Martin Rudalics <rudalics@gmx.at> + + * window.h: Declare delete_all_child_windows instead of + delete_all_subwindows. + * window.c (Fwindow_nest, Fset_window_nest) + (Fset_window_new_total, Fset_window_new_normal) + (Fwindow_resize_apply): Don't use term subwindow in doc-strings. + (delete_all_subwindows): Rename to delete_all_child_windows. + (Fdelete_other_windows_internal, Fset_window_configuration): + Call delete_all_child_windows instead of delete_all_subwindows. + * frame.c (delete_frame): Call delete_all_child_windows instead + of delete_all_subwindows. + +2011-11-07 Paul Eggert <eggert@cs.ucla.edu> + + * alloc.c (DEADP): New macro, for porting to GNU/Hurd (Bug#9926). + This is also needed for porting to any host where GC_MARK_STACK is + not GC_MAKE_GCPROS_NOOPS. + (which_symbols): Use it. + +2011-11-07 Kenichi Handa <handa@m17n.org> + + * coding.c (coding_set_destination): Check coding->src_pos only + when coding->src_object is a buffer (bug#9910). + + * process.c (send_process): Set the member src_multibyte of coding + to 0 (bug#9911) when sending a unibyte text. + + * callproc.c (Fcall_process): Set the member src_multibyte of + process_coding to 0 (bug#9912). + +2011-11-06 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * xmenu.c (cleanup_widget_value_tree): New function. + (xmenu_show, xdialog_show): Use it in record_unwind_protect instead of + calling free_menubar_widget_value_tree directly (Bug#9830). + +2011-11-06 Paul Eggert <eggert@cs.ucla.edu> + + Fix some portability problems with 'inline'. + * dispextern.h (window_box, window_box_height, window_text_bottom_y) + (window_box_width, window_box_left, window_box_left_offset) + (window_box_right, window_box_right_offset): Declare extern. + Otherwise, these inline functions do not conform to C99 and + are miscompiled by Microsoft compilers. Reported by Eli Zaretskii in + <http://lists.gnu.org/archive/html/emacs-devel/2011-11/msg00084.html>. + * intervals.c (adjust_intervals_for_insertion) + (adjust_intervals_for_deletion): Now extern, because otherwise the + extern inline functions 'offset_intervals' couldn't refer to it. + (static_offset_intervals): Remove. + (offset_intervals): Rewrite using the old contents of + static_offset_intervals. The old version didn't conform to C99 + because an extern inline function contained a reference to an + identifier with static linkage. + +2011-11-06 Andreas Schwab <schwab@linux-m68k.org> + + * keyboard.c (interrupt_signal): Don't call kill-emacs while in + GC. + +2011-11-06 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (init_iterator, reseat_to_string): Don't set the + iterator's bidi_p flag if Vpurify_flag is non-nil. (Bug#9963) + (Fcurrent_bidi_paragraph_direction): If Vpurify_flag is non-nil, + return Qleft_to_right. + +2011-11-06 Chong Yidong <cyd@gnu.org> + + * window.c (Fwindow_live_p, Fwindow_frame, Fframe_root_window) + (Fminibuffer_window, Fwindow_buffer, Fwindow_splits) + (Fset_window_splits, Fwindow_nest, Fset_window_nest) + (Fwindow_use_time, Fwindow_total_size, Fwindow_normal_size) + (Fwindow_new_normal, Fwindow_left_column, Fwindow_top_line) + (Fwindow_margins, Fwindow_fringes, Fwindow_scroll_bars) + (Fwindow_vscroll): Doc fix. + (Fwindow_top_child, Fwindow_left_child): Eliminate a nil default + argument, since it makes no sense to pass a live window and for + consistency with window-child. + +2011-11-05 Christoph Scholtes <cschol2112@googlemail.com> + + * makefile.w32-in ($(TEMACS), (gl-stamp)): Use $(THISDIR) to + support MSVC. + +2011-11-05 Jason Rumney <jasonr@gnu.org> + + * w32font.c (font_matches_spec): Filter out non-Japanese kana fonts. + (add_font_entity_to_list): Filter out non-Japanese Shift-JIS + fonts (Bug#6029). + (add_font_entity_to_list): Fix logic errors in mixed boolean and + bitwise arithmetic preventing use of unicode-sip and non-truetype + opentype fonts. + +2011-11-05 Eli Zaretskii <eliz@gnu.org> + + * s/ms-w32.h (fstat, stat, utime): Move redirections to + "emacs"-only part. + + * w32fns.c (x_create_tip_frame, Fx_create_frame): Rearrange + initialization code to keep similarity to xfns.c after changes + from 2011-11-05. + +2011-11-05 Jan Djärv <jan.h.d@swipnet.se> + + * nsfns.m: Declare image_cache_refcount if GLYPH_DEBUG. + (unwind_create_frame): New function (Bug#9943). + (Fx_create_frame): Restructure code to be more similar to the one in + xfns.c. Call record_unwind_protect with unwind_create_frame (Bug#9943). + Initialize image_cache_refcount if GLYPH_DEBUG (Bug#9943). + Move terminal->reference_count++ just before making the frame official + (Bug#9943). + + * nsterm.m (x_free_frame_resources): New function. + (x_destroy_window): Move code to x_free_frame_resources. + + * xfns.c (unwind_create_frame): Fix comment. + (Fx_create_frame, x_create_tip_frame): Move + terminal->reference_count++ just before making the frame + official. Move initialization of image_cache_refcount and + dpyinfo_refcount before calling init_frame_faces (Bug#9943). + +2011-11-05 Eli Zaretskii <eliz@gnu.org> + + Support MSVC build with newer versions of Visual Studio. + * makefile.w32-in (TAGS-gmake): Don't use $(patsubst ...), as + Nmake barfs on that. Use $(OBJ*_c) variables instead, defined on + nt/gmake.defs. + + * lisp.h (ENUM_BF): New macro, for enumerated types in bitfields, + which are not supported by MSVC. + (Lisp_Symbol, Lisp_Misc_Any, Lisp_Marker, Lisp_Misc_Overlay) + (Lisp_Save_Value, Lisp_Free): Use ENUM_BF for enumerated types in + bitfields. + (Lisp_Object) [USE_LISP_UNION_TYPE]: Use ENUM_BF for enumerated + types in bitfields. + (DEFUN) [_MSC_VER]: Define in a different way for MSVC. + + * w32fns.c [_MSC_VER]: DECLARE_HANDLE for any MSVC version. + +2011-11-05 Fabrice Popineau <fabrice.popineau@supelec.fr> (tiny change) + + Support MSVC build with newer versions of Visual Studio. + * w32.c: Don't include w32api.h for MSVC. + (init_environment) [_MSC_VER]: Call sys_access, not _access. + + * s/ms-w32.h <sigset_t, ssize_t> [_MSC_VER]: Typedefs for MSVC. + [_MSC_VER]: Include sys/timeb.h, sys/stat.h, and signal.h. + (fstat, stat, utime) [_MSC_VER]: Redirect to their sys_* cousins. + (malloc, free, realloc, calloc) [_MSC_VER]: Always redirect to the + e_* cousins. + (alloca) [_MSC_VER]: Define to _alloca. + + * lisp.h (DECL_ALIGN) [_MSC_VER]: Define for MSVC. + + * regex.c <re_char> [_MSC_VER]: A separate definition for MSVC. + +2011-11-04 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (note_mouse_highlight): If either of + previous/next-single-property-change returns nil, treat that as + the beginning or the end of the buffer. (Bug#9955) + +2011-11-04 Jan Djärv <jan.h.d@swipnet.se> + + * gtkutil.c (xg_make_tool_item): Add callbacks if one of wimage or + label is not null (Bug#9951). + (xg_tool_item_stale_p): Handle the fact that wimage and/or wlbl + may be NULL. + +2011-11-04 Eli Zaretskii <eliz@gnu.org> + + * window.c (Fwindow_body_size): Mention in the doc string that the + return value is in frame's canonical units. (Bug#9949) + +2011-11-03 Eli Zaretskii <eliz@gnu.org> + + * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947) + + * w32fns.c (unwind_create_frame): If needed, free the glyph + matrices of the partially constructed frame. (Bug#9943) + * xfns.c (unwind_create_frame): Likewise. + 2011-11-01 Eli Zaretskii <eliz@gnu.org> * xdisp.c (mouse_face_from_buffer_pos): Fix a typo in a comment. @@ -805,7 +1163,7 @@ * xdisp.c (try_cursor_movement): Make sure ROW isn't decremented past the beginning of the current glyph matrix. -2011-10-30 Adam Sjøgren <asjo@koldfront.dk> (tiny change) +2011-10-30 Adam Sjøgren <asjo@koldfront.dk> (tiny change) * xterm.c: Include X11/Xproto.h if HAVE_GTK3. (x_error_handler): Ignore BadMatch for X_SetInputFocus for @@ -839,7 +1197,7 @@ Fix the `xbytecode' command. * .gdbinit (xprintbytestr): New command. - (xwhichsymbols): Renamed from `which'; all callers changed. + (xwhichsymbols): Rename from `which'; all callers changed. (xbytecode): Print the byte-code string as well. 2011-10-29 Kim Storm <storm@cua.dk> @@ -3511,6 +3869,9 @@ 2011-07-08 Jason Rumney <jasonr@gnu.org> + * w32term.c (x_make_frame_visible): Use SH_SHOWNORMAL rather than + SH_SHOW for hidden windows (Bug#5482). + * w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using frame struct members of non-existent frames (Bug#6284). @@ -3530,7 +3891,7 @@ * nsselect.m (ns_string_from_pasteboard): Don't use deprecated methods cString and lossyCString on OSX >= 10.4 - * nsmenu.m (fillWithWidgetValue): Don't use depercated method + * nsmenu.m (fillWithWidgetValue): Don't use deprecated method sizeToFit on OSX >= 10.2. * nsimage.m (allocInitFromFile): Don't use deprecated method diff --git a/src/ChangeLog.1 b/src/ChangeLog.1 index e32db190cd0..efe77648458 100644 --- a/src/ChangeLog.1 +++ b/src/ChangeLog.1 @@ -405,7 +405,7 @@ Copy their own header field a_scovfrl from ohdr. * unexec.c [COFF]: - Round positions of text and and data sections in output file + Round positions of text and data sections in output file to page boundaries. * crt0.c: Install version for Encore machines. @@ -2375,7 +2375,7 @@ Often, just return what it returned. `error' still never returns to its caller. - * Signalling Qargs_out_of_range: + * Signaling Qargs_out_of_range: Use new functions args_out_of_range and args_out_of_range_3 (in data.c) to do this. @@ -3537,4 +3537,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 6152b4c76af..181b11b5a2b 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -5133,7 +5133,7 @@ it can be called in a signal handler. (x_catch_errors_unwind): Function deleted. (x_uncatch_errors): Deallocate last x_error_message_stack struct. - (x_check_errors): Call x_uncatch_errors before signalling error. + (x_check_errors): Call x_uncatch_errors before signaling error. (x_load_font, x_term_init, XTmouse_position, handle_one_xevent) (x_connection_closed, x_list_fonts): Use new versions of @@ -19139,7 +19139,7 @@ (font_rescale_ratio): New function. (split_font_name): If NUMERIC_P is nonzero, set font->rescale_ratio. (better_font_p): On comparing point sized, pay attention to - recale_ratio member of fonts. + rescale_ratio member of fonts. (build_scalable_font_name): Reflect font->rescale_ratio in the font name. (syms_of_xfaces): Declare Vface_font_rescale_alist as a Lisp variable. @@ -20702,11 +20702,11 @@ (free_frame_menubar): Only compile if not USE_GTK. GTK version is in gtkutil.c. (popup_selection_callback): New version for USE_GTK. - (create_and_show_popup_menu): New fuction, one USE_GTK version and + (create_and_show_popup_menu): New function, one USE_GTK version and one USE_X_TOOLKIT version. (xmenu_show): Call create_and_show_popup_menu. (dialog_selection_callback): New version for USE_GTK. - (create_and_show_dialog): New fuction, one USE_GTK version and + (create_and_show_dialog): New function, one USE_GTK version and one USE_X_TOOLKIT version. (xdialog_show): Call create_and_show_dialog. @@ -22780,7 +22780,7 @@ 2002-07-23 Kenichi Handa <handa@etl.go.jp> * xdisp.c (face_before_or_after_it_pos): - Call FETCH_MULTIBYTE_CHAR with byte postion, not char position. + Call FETCH_MULTIBYTE_CHAR with byte position, not char position. 2002-07-22 Juanma Barranquero <lektu@terra.es> @@ -27928,4 +27928,3 @@ See ChangeLog.9 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index 0a9df7d1aee..73ac5fd4e00 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 @@ -7949,7 +7949,7 @@ 2010-05-11 Karel Klíč <kklic@redhat.com> * ftfont.c: Fix incorrect parentheses of #if condition for - definining M17N_FLT_USE_NEW_FEATURE. + defining M17N_FLT_USE_NEW_FEATURE. 2010-05-11 Glenn Morris <rgm@gnu.org> @@ -11972,7 +11972,7 @@ * image.c (xbm_read_bitmap_data): New arg inhibit_image_error. (xbm_load_image): Caller changed. - (xbm_file_p): Avoid signalling an image_error (Bug#4107). + (xbm_file_p): Avoid signaling an image_error (Bug#4107). 2009-08-13 Nick Roberts <nickrob@snap.net.nz> @@ -16658,7 +16658,7 @@ 2008-08-20 Chong Yidong <cyd@stupidchicken.com> * xselect.c (x_get_foreign_selection): Return nil if desired - selection could not be obtained, instead of signalling an error. + selection could not be obtained, instead of signaling an error. 2008-08-20 David Reitter <david.reitter@gmail.com> @@ -23551,7 +23551,7 @@ STORE_XCHARB a valid l-value. * w32term.c (w32_native_per_char_metric): Swap width and rbearing - calculations for non-Truetype fonts. + calculations for non-TrueType fonts. (x_draw_glyph_string): Sync with xterm.c. (x_draw_glyph_string_foreground) [USE_FONT_BACKEND]: Remove redundant code. @@ -25474,7 +25474,7 @@ * term.c (terminal_encode_buffer): Make externally visible. - * makefile.w32-in: Add character.h dependancies. + * makefile.w32-in: Add character.h dependencies. (character.o, chartab.o): New targets. 2008-02-01 Kenichi Handa <handa@m17n.org> @@ -26748,7 +26748,7 @@ 2008-02-01 Kenichi Handa <handa@m17n.org> * xdisp.c (face_before_or_after_it_pos): - Call FETCH_MULTIBYTE_CHAR with byte postion, not char position. + Call FETCH_MULTIBYTE_CHAR with byte position, not char position. 2008-02-01 Kenichi Handa <handa@m17n.org> @@ -29718,7 +29718,7 @@ * keyboard.c (restore_kboard_configuration): Only define when MULTI_KBOARD defined. - * makefile.w32-in: Update dependancies from Makefile.in. + * makefile.w32-in: Update dependencies from Makefile.in. (OBJ1): Add terminal.$(O) * term.c (dissociate_if_controlling_tty) [WINDOWSNT]: diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index ca7feaee9f5..05e448c043c 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 @@ -1222,7 +1222,7 @@ 1987-07-10 Chris Hanson (cph@prep) * xterm.h: Define macros to abstract control of input signals. - Alternate set of macros for hp-ux does no signalling. + Alternate set of macros for hp-ux does no signaling. * xterm.c: * xfns.c: @@ -4787,4 +4787,3 @@ See ChangeLog.1 for earlier changes. You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. - diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index beb7a0a2ae1..cdfe63fc59c 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 @@ -900,9 +900,9 @@ invalid overlay. (syms_of_buffer): defsubr Soverlayp; initialize Qoverlayp. (Fdelete_overlay): Set the overlay's markers to point nowhere. - Use CHECK_OVERLAY instead of signalling a special error. + Use CHECK_OVERLAY instead of signaling a special error. (Fmove_overlay, Foverlay_put): Use CHECK_OVERLAY instead of - signalling a special error. + signaling a special error. (Foverlay_get): Use CHECK_OVERLAY. * fns.c (internal_equal): Define this for overlays. * buffer.h (OVERLAY_VALID): Define in terms of OVERLAYP. @@ -5549,7 +5549,7 @@ h->poll_suppress_count. * eval.c (Fsignal): It's okay for the debugger to return to the - caller if the caller was signalling a quit. + caller if the caller was signaling a quit. * eval.c (unbind_catch): Restore the polling suppression count here, instead of in Fsignal and Fthrow. @@ -10592,7 +10592,7 @@ (init_x_parm_symbols, x_set_screen_param): Use x_screen_parms instead of a large switch statement. (x_figure_window_size): Make the default case of the switch call - abort instead of signalling an error, since window_prompting's + abort instead of signaling an error, since window_prompting's value is internally generated. 1991-05-01 Jim Blandy (jimb@churchy.gnu.ai.mit.edu) @@ -13393,7 +13393,7 @@ * macros.c (Fstart_kbd_macro): Local cleanup. - * minibuf.c (read_minibuf): No more delcaration of + * minibuf.c (read_minibuf): No more declaration of Frestore_screen_configuration. * search.c (Fregexp_quote): Simplified. @@ -14884,7 +14884,7 @@ 1989-08-07 Richard Stallman (rms@sugar-bombs.ai.mit.edu) - * fileio.c (barf_or_query_if_file_exists): When signalling, + * fileio.c (barf_or_query_if_file_exists): When signaling, provide the expected args for a file-error. 1989-08-06 Richard Stallman (rms@sugar-bombs.ai.mit.edu) @@ -15414,7 +15414,7 @@ * xfns.c (Fx_create_screen): If user has specified `x-iconic-startup' then start emacs in iconic form. Look for icon position in `icon-left' and `icon-top', or use - window postion. + window position. * xterm.c (x_term_init): If server doesn't respond, use fatal instead of error. Also tell user about -d option. diff --git a/src/ChangeLog.4 b/src/ChangeLog.4 index dc8fe23a221..208d9c2cdb0 100644 --- a/src/ChangeLog.4 +++ b/src/ChangeLog.4 @@ -811,7 +811,7 @@ 1994-04-28 Michael D. Ernst (mernst@monozygote.research.microsoft.com) - * fileio.c (inhibit-file-name-handers): Correct documentation. + * fileio.c (inhibit-file-name-handlers): Correct documentation. 1994-04-28 Karl Heuer (kwzh@hal.gnu.ai.mit.edu) @@ -1885,7 +1885,7 @@ 1994-03-22 Frederic Pierresteguy (fp@mole.gnu.ai.mit.edu) * widget.c (set_frame_size): Put #if 0 around a lot of useless code. - Compute explicitely the geometry of the toplevel widget. + Compute explicitly the geometry of the toplevel widget. Call XtSetValues not XtVaSetValues. 1994-03-22 Richard Stallman (rms@mole.gnu.ai.mit.edu) diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index f9372aa666a..141a570040c 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 @@ -1138,7 +1138,7 @@ ntproc.c and simplified to match other changes (all handles are already non-inheritable). - (get_emacs_configuration): Detect Windows flavour (Windows 95 or + (get_emacs_configuration): Detect Windows flavor (Windows 95 or NT) at run-time. Change OS name for Windows 95 to be "win95". (fd_info): New variable. Array of extra info for file descriptors diff --git a/src/ChangeLog.7 b/src/ChangeLog.7 index d5bebec660f..73d0d45e9c1 100644 --- a/src/ChangeLog.7 +++ b/src/ChangeLog.7 @@ -592,7 +592,7 @@ * coding.h (Qemacs_mule): Extern it. - * process.c (init_process): Initilize Vdefault_process_coding_system. + * process.c (init_process): Initialize Vdefault_process_coding_system. 1998-06-26 Kenichi Handa <handa@etl.go.jp> @@ -972,7 +972,7 @@ 1998-06-01 Ken'ichi Handa <handa@melange.gnu.org> - * coding.c (detect_coding_mask): Initilize local variable C. + * coding.c (detect_coding_mask): Initialize local variable C. 1998-06-01 Richard Stallman <rms@gnu.org> @@ -5943,7 +5943,7 @@ Vauto_file_coding_system. (syms_of_fileio): Adjusted for the above change. Doc change. (Finsert_file_contents): The argument for Vset_auto_coding is a - concatination of the heading 1K-byte and the tailing 3K-byte. + concatenation of the heading 1K-byte and the tailing 3K-byte. * cmds.c (internal_self_insert): Only set TARGET_CLM when C2 is tab. When multibyte characters are disabled, @@ -6317,7 +6317,7 @@ (ENCODE_ISO_CHARACTER_DIMENSION2): Likewise. (safe_terminal_coding): New variable. (Fset_safe_terminal_coding_system_internal): New function. - (init_coding_once): Initilize safe_terminal_coding. + (init_coding_once): Initialize safe_terminal_coding. (syms_of_coding): Declare set-safe-terminal-coding-system as a Lisp function. @@ -7399,7 +7399,7 @@ 1997-06-18 Kenichi Handa <handa@etl.go.jp> - * coding.c (detect_coding_iso2022): Initilize mask correctly. + * coding.c (detect_coding_iso2022): Initialize mask correctly. * fns.c (concat): Pay attention to multibyte characters when TARGET_TYPE is Lisp_String. @@ -7485,7 +7485,7 @@ 1997-06-09 Kenichi Handa <handa@etl.go.jp> - * buffer.c (init_buffer_once): Inititialize the member + * buffer.c (init_buffer_once): Initialize the member buffer_file_coding_system. (syms_of_buffer): Declare Lisp variables default-buffer-file-coding-system and buffer-file-coding-system. diff --git a/src/ChangeLog.8 b/src/ChangeLog.8 index 833119c9fcf..00e4a1f62c8 100644 --- a/src/ChangeLog.8 +++ b/src/ChangeLog.8 @@ -919,7 +919,7 @@ 1999-11-28 Eli Zaretskii <eliz@is.elta.co.il> * charset.c (Fmake_char_internal): Print the charset ID when - signalling an error. + signaling an error. * emacs.c (synchronize_locale): Avoid compiler warnings about pointer type mismatch. @@ -2196,7 +2196,7 @@ 1999-09-14 Gerd Moellmann <gerd@gnu.org> - * sound.c (Fplay_sound): Remove usused variables. + * sound.c (Fplay_sound): Remove unused variables. (be2hs): Put in #if 0 because it's currently not used. 1999-09-14 Ken Raeburn <raeburn@gnu.org> @@ -7367,7 +7367,7 @@ * xfaces.c (free_font): Removed. (load_face_font_or_fontset): Renamed from load_font. - (load_face_font_or_fontset): Use message2 instead of signalling. + (load_face_font_or_fontset): Use message2 instead of signaling. (load_color): Likewise. (load_pixmap): Likewise. @@ -13404,7 +13404,7 @@ 1998-10-20 Jason Rumney <jasonr@altavista.net> - * makefile.nt (w32fns.c): Add x-list-font.c to dependancies. + * makefile.nt (w32fns.c): Add x-list-font.c to dependencies. * w32faces.c: Update comments referring to obsolete structs. (allocate_face, copy_face, face_eql, load_font) diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index ceec5da3296..9e7bd24f792 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 @@ -4617,7 +4617,7 @@ * lisp.h (detect_coding_system): Prototype adjusted. * coding.c (ONE_MORE_BYTE_CHECK_MULTIBYTE): New macro. - (detect_coding_emacs_mule, detect_coding_iso2022,) + (detect_coding_emacs_mule, detect_coding_iso2022) (detect_coding_sjis, detect_coding_big5, detect_coding_utf_8) (detect_coding_utf_16, detect_coding_ccl): Make them static. New argument MULTIBYTEP. Callers changed. @@ -8409,7 +8409,7 @@ (encode_coding_iso2022): New local variable safe_chars. Check unsafe chars. (setup_coding_system): Delete the code to initialize - coding->safe_charses. + coding->safe_charsets. (intersection, find_safe_codings): New functions. (Ffind_coding_systems_region_internal): New function. (syms_of_coding): Defsubr it. Initialize Qsafe_chars, diff --git a/src/alloc.c b/src/alloc.c index 86127dd5197..f21f0b4fa3a 100644 --- a/src/alloc.c +++ b/src/alloc.c @@ -315,6 +315,7 @@ static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); on free lists recognizable in O(1). */ static Lisp_Object Vdead; +#define DEADP(x) EQ (x, Vdead) #ifdef GC_MALLOC_CHECK @@ -411,6 +412,10 @@ static void check_gcpros (void); #endif /* GC_MARK_STACK || GC_MALLOC_CHECK */ +#ifndef DEADP +# define DEADP(x) 0 +#endif + /* Recording what needs to be marked for gc. */ struct gcpro *gcprolist; @@ -877,7 +882,7 @@ safe_alloca_unwind (Lisp_Object arg) /* Like malloc but used for allocating Lisp data. NBYTES is the number of bytes to allocate, TYPE describes the intended use of the - allcated memory block (for strings, for conses, ...). */ + allocated memory block (for strings, for conses, ...). */ #ifndef USE_LSB_TAG static void *lisp_malloc_loser; @@ -1407,7 +1412,7 @@ uninterrupt_malloc (void) #ifdef DOUG_LEA_MALLOC pthread_mutexattr_t attr; - /* GLIBC has a faster way to do this, but lets keep it portable. + /* GLIBC has a faster way to do this, but let's keep it portable. This is according to the Single UNIX Specification. */ pthread_mutexattr_init (&attr); pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE); @@ -6262,7 +6267,7 @@ which_symbols (Lisp_Object obj, EMACS_INT find_max) ptrdiff_t gc_count = inhibit_garbage_collection (); Lisp_Object found = Qnil; - if (!EQ (obj, Vdead)) + if (! DEADP (obj)) { for (sblk = symbol_block; sblk; sblk = sblk->next) { diff --git a/src/buffer.c b/src/buffer.c index fec633371fc..f1ce9f4ec47 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -4430,7 +4430,7 @@ static int mmap_initialized_p; is currently mapped. Used to prevent overwriting an existing memory mapping. - Default is to conservativly assume the address range is occupied by + Default is to conservatively assume the address range is occupied by something else. This can be overridden by system configuration files if system-specific means to determine this exists. */ diff --git a/src/bytecode.c b/src/bytecode.c index ed85d54d789..fdefe39a69d 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -271,7 +271,7 @@ struct byte_stack /* A list of currently active byte-code execution value stacks. Fbyte_code adds an entry to the head of this list before it starts processing byte-code, and it removed the entry again when it is - done. Signalling an error truncates the list analoguous to + done. Signaling an error truncates the list analogous to gcprolist. */ struct byte_stack *byte_stack_list; diff --git a/src/callproc.c b/src/callproc.c index ecb03ea9db2..d8f50e21ee5 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -722,6 +722,7 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) /* If BUFFER is nil, we must read process output once and then discard it, so setup coding system but with nil. */ setup_coding_system (Qnil, &process_coding); + process_coding.dst_multibyte = 0; } else { @@ -757,7 +758,10 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */) && !NILP (val)) val = raw_text_coding_system (val); setup_coding_system (val, &process_coding); + process_coding.dst_multibyte + = ! NILP (BVAR (current_buffer, enable_multibyte_characters)); } + process_coding.src_multibyte = 0; immediate_quit = 1; QUIT; diff --git a/src/ccl.c b/src/ccl.c index 4764fa0f5b5..97fca3bb032 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -429,7 +429,7 @@ static Lisp_Object Vccl_program_table; #define CCL_Extension 0x1F /* Extended CCL code 1:ExtendedCOMMNDRrrRRRrrrXXXXX - 2:ARGUEMENT + 2:ARGUMENT 3:... ------------------------------ extended_command (rrr,RRR,Rrr,ARGS) @@ -484,7 +484,7 @@ static Lisp_Object Vccl_program_table; If the element is t or lambda, finish without changing reg[rrr]. If the element is a number, set reg[rrr] to the number and finish. - Detail of the map structure is descibed in the comment for + Detail of the map structure is described in the comment for CCL_MapMultiple below. */ #define CCL_IterateMultipleMap 0x10 /* Iterate multiple maps @@ -1762,7 +1762,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size case CCL_STAT_QUIT: if (! ccl->quit_silently) - sprintf (msg, "\nCCL: Quited."); + sprintf (msg, "\nCCL: Quitted."); break; default: @@ -1808,7 +1808,7 @@ ccl_driver (struct ccl_program *ccl, int *source, int *destination, int src_size /* Resolve symbols in the specified CCL code (Lisp vector). This function converts symbols of code conversion maps and character - translation tables embeded in the CCL code into their ID numbers. + translation tables embedded in the CCL code into their ID numbers. The return value is a new vector in which all symbols are resolved, Qt if resolving of some symbol failed, diff --git a/src/character.c b/src/character.c index 3517dbba47d..d5d89381aaf 100644 --- a/src/character.c +++ b/src/character.c @@ -589,7 +589,7 @@ parse_str_as_multibyte (const unsigned char *str, ptrdiff_t len, } /* Arrange unibyte text at STR of NBYTES bytes as a multibyte text. - It actually converts only such 8-bit characters that don't contruct + It actually converts only such 8-bit characters that don't construct a multibyte sequence to multibyte forms of Latin-1 characters. If NCHARS is nonzero, set *NCHARS to the number of characters in the text. It is assured that we can use LEN bytes at STR as a work @@ -966,7 +966,7 @@ character is a target to get a byte value. In this case, POSITION, if non-nil, is an index of a target character in the string. If the current buffer (or STRING) is multibyte, and the target -character is not ASCII nor 8-bit character, an error is signalled. */) +character is not ASCII nor 8-bit character, an error is signaled. */) (Lisp_Object position, Lisp_Object string) { int c; diff --git a/src/charset.c b/src/charset.c index 6aa6fe46b54..8f16771b855 100644 --- a/src/charset.c +++ b/src/charset.c @@ -163,8 +163,8 @@ static struct /* 1 iff the following table is used for encoder. */ short for_encoder; - /* When the following table is used for encoding, mininum and - maxinum character of the current charset. */ + /* When the following table is used for encoding, minimum and + maximum character of the current charset. */ int min_char, max_char; /* A Unicode character correspoinding to the code indice 0 (i.e. the diff --git a/src/charset.h b/src/charset.h index 483b7e29f7b..6d9079291c7 100644 --- a/src/charset.h +++ b/src/charset.h @@ -153,7 +153,7 @@ struct charset /* Dimension of the charset: 1, 2, 3, or 4. */ int dimension; - /* Byte code range of each dimension. <code_space>[4N] is a mininum + /* Byte code range of each dimension. <code_space>[4N] is a minimum byte code of the (N+1)th dimension, <code_space>[4N+1] is a maximum byte code of the (N+1)th dimension, <code_space>[4N+2] is (<code_space>[4N+1] - <code_space>[4N] + 1), <code_space>[4N+3] @@ -199,14 +199,14 @@ struct charset /* The method for encoding/decoding characters of the charset. */ enum charset_method method; - /* Mininum and Maximum code points of the charset. */ + /* Minimum and Maximum code points of the charset. */ unsigned min_code, max_code; /* Offset value used by macros CODE_POINT_TO_INDEX and INDEX_TO_CODE_POINT. . */ unsigned char_index_offset; - /* Mininum and Maximum character codes of the charset. If the + /* Minimum and Maximum character codes of the charset. If the charset is compatible with ASCII, min_char is a minimum non-ASCII character of the charset. If the method of charset is CHARSET_METHOD_OFFSET, even if the charset is unified, min_char diff --git a/src/chartab.c b/src/chartab.c index 06def16e795..c3dd1fe5b15 100644 --- a/src/chartab.c +++ b/src/chartab.c @@ -758,7 +758,7 @@ map_sub_char_table (void (*c_function) (Lisp_Object, Lisp_Object, Lisp_Object), { /* Depth of TABLE. */ int depth; - /* Minimum and maxinum characters covered by TABLE. */ + /* Minimum and maximum characters covered by TABLE. */ int min_char, max_char; /* Number of characters covered by one element of TABLE. */ int chars_in_block; @@ -1196,7 +1196,7 @@ uniprop_table_uncompress (Lisp_Object table, int idx) } -/* Decode VALUE as an elemnet of char-table TABLE. */ +/* Decode VALUE as an element of char-table TABLE. */ static Lisp_Object uniprop_decode_value_run_length (Lisp_Object table, Lisp_Object value) diff --git a/src/coding.c b/src/coding.c index e8765aea96d..b0dfc498add 100644 --- a/src/coding.c +++ b/src/coding.c @@ -1043,7 +1043,7 @@ coding_set_destination (struct coding_system *coding) { if (BUFFERP (coding->dst_object)) { - if (coding->src_pos < 0) + if (BUFFERP (coding->src_object) && coding->src_pos < 0) { coding->destination = BEG_ADDR + coding->dst_pos_byte - BEG_BYTE; coding->dst_bytes = (GAP_END_ADDR diff --git a/src/coding.h b/src/coding.h index 3cf28fb2458..2165fa23712 100644 --- a/src/coding.h +++ b/src/coding.h @@ -518,7 +518,7 @@ struct coding_system #define CODING_REQUIRE_DETECTION_MASK 0x1000 #define CODING_RESET_AT_BOL_MASK 0x2000 -/* Return 1 if the coding context CODING requires annotaion +/* Return 1 if the coding context CODING requires annotation handling. */ #define CODING_REQUIRE_ANNOTATION(coding) \ ((coding)->common_flags & CODING_ANNOTATION_MASK) diff --git a/src/composite.c b/src/composite.c index 90a239281fe..0a9bdcffc99 100644 --- a/src/composite.c +++ b/src/composite.c @@ -1308,7 +1308,7 @@ composition_reseat_it (struct composition_it *cmp_it, ptrdiff_t charpos, ptrdiff if (cmp_it->lookback == 0) goto no_composition; lgstring = Qnil; - /* Try to find a shorter compostion that starts after CPOS. */ + /* Try to find a shorter composition that starts after CPOS. */ composition_compute_stop_pos (cmp_it, charpos, bytepos, cpos, string); if (cmp_it->ch == -2 || cmp_it->stop_pos < charpos) diff --git a/src/composite.h b/src/composite.h index b21994e5e3c..39e82ad74ad 100644 --- a/src/composite.h +++ b/src/composite.h @@ -41,7 +41,7 @@ enum composition_method { COMPOSITION_NO }; -/* Maximum number of compoments a single composition can have. */ +/* Maximum number of components a single composition can have. */ #define MAX_COMPOSITION_COMPONENTS 16 /* These macros access information about a composition that diff --git a/src/data.c b/src/data.c index d38dc5e0c58..7b30e91b12f 100644 --- a/src/data.c +++ b/src/data.c @@ -2028,7 +2028,7 @@ DEFUN ("indirect-function", Findirect_function, Sindirect_function, 1, 2, 0, If OBJECT is not a symbol, just return it. Otherwise, follow all function indirections to find the final function binding and return it. If the final symbol in the chain is unbound, signal a void-function error. -Optional arg NOERROR non-nil means to return nil instead of signalling. +Optional arg NOERROR non-nil means to return nil instead of signaling. Signal a cyclic-function-indirection error if there is a loop in the function chain of symbols. */) (register Lisp_Object object, Lisp_Object noerror) diff --git a/src/dired.c b/src/dired.c index db07bc61e7d..3a3adfb5082 100644 --- a/src/dired.c +++ b/src/dired.c @@ -628,7 +628,7 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, int all_flag, int v if (includeall && !canexclude) { /* If we have one non-excludable file, we want to exclude the - excudable files. */ + excludable files. */ includeall = 0; /* Throw away any previous excludable match found. */ bestmatch = Qnil; diff --git a/src/dispextern.h b/src/dispextern.h index b1c3d6237c9..ccb85e7422e 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3126,6 +3126,11 @@ void compute_fringe_widths (struct frame *, int); void w32_init_fringe (struct redisplay_interface *); void w32_reset_fringes (void); #endif + +#if XASSERTS +extern unsigned row_hash (struct glyph_row *); +#endif + /* Defined in image.c */ #ifdef HAVE_WINDOW_SYSTEM diff --git a/src/dispnew.c b/src/dispnew.c index 93a990cff47..88f75414074 100644 --- a/src/dispnew.c +++ b/src/dispnew.c @@ -429,6 +429,14 @@ margin_glyphs_to_reserve (struct window *w, int total_glyphs, Lisp_Object margin return n; } +#if XASSERTS +/* Return non-zero if ROW's hash value is correct, zero if not. */ +static int +verify_row_hash (struct glyph_row *row) +{ + return row->hash == row_hash (row); +} +#endif /* Adjust glyph matrix MATRIX on window W or on a frame to changed window sizes. @@ -600,6 +608,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y row->glyphs[LAST_AREA] = row->glyphs[LEFT_MARGIN_AREA] + dim.width; } + xassert (!row->enabled_p || verify_row_hash (row)); ++row; } } @@ -1063,37 +1072,55 @@ swap_glyphs_in_rows (struct glyph_row *a, struct glyph_row *b) #endif /* 0 */ -/* Exchange pointers to glyph memory between glyph rows A and B. */ +/* Exchange pointers to glyph memory between glyph rows A and B. Also + exchange the used[] array and the hash values of the rows, because + these should all go together for the row's hash value to be + correct. */ static inline void swap_glyph_pointers (struct glyph_row *a, struct glyph_row *b) { int i; + unsigned hash_tem = a->hash; + for (i = 0; i < LAST_AREA + 1; ++i) { struct glyph *temp = a->glyphs[i]; + short used_tem = a->used[i]; + a->glyphs[i] = b->glyphs[i]; b->glyphs[i] = temp; + a->used[i] = b->used[i]; + b->used[i] = used_tem; } + a->hash = b->hash; + b->hash = hash_tem; } /* Copy glyph row structure FROM to glyph row structure TO, except - that glyph pointers in the structures are left unchanged. */ + that glyph pointers, the `used' counts, and the hash values in the + structures are left unchanged. */ static inline void copy_row_except_pointers (struct glyph_row *to, struct glyph_row *from) { struct glyph *pointers[1 + LAST_AREA]; + short used[1 + LAST_AREA]; + unsigned hashval; /* Save glyph pointers of TO. */ memcpy (pointers, to->glyphs, sizeof to->glyphs); + memcpy (used, to->used, sizeof to->used); + hashval = to->hash; /* Do a structure assignment. */ *to = *from; /* Restore original pointers of TO. */ memcpy (to->glyphs, pointers, sizeof to->glyphs); + memcpy (to->used, used, sizeof to->used); + to->hash = hashval; } @@ -1271,6 +1298,9 @@ line_draw_cost (struct glyph_matrix *matrix, int vpos) static inline int row_equal_p (struct glyph_row *a, struct glyph_row *b, int mouse_face_p) { + xassert (verify_row_hash (a)); + xassert (verify_row_hash (b)); + if (a == b) return 1; else if (a->hash != b->hash) @@ -3467,7 +3497,7 @@ redraw_overlapping_rows (struct window *w, int yb) if (row->used[RIGHT_MARGIN_AREA]) rif->fix_overlapping_area (w, row, RIGHT_MARGIN_AREA, overlaps); - /* Record in neighbour rows that ROW overwrites part of + /* Record in neighbor rows that ROW overwrites part of their display. */ if (overlaps & OVERLAPS_PRED) MATRIX_ROW (w->current_matrix, i - 1)->overlapped_p = 1; @@ -4209,6 +4239,7 @@ add_row_entry (struct glyph_row *row) ptrdiff_t i = row->hash % row_table_size; entry = row_table[i]; + xassert (entry || verify_row_hash (row)); while (entry && !row_equal_p (entry->row, row, 1)) entry = entry->next; @@ -4333,10 +4364,10 @@ scrolling_window (struct window *w, int header_line_p) j = last_old; while (i - 1 > first_new && j - 1 > first_old - && MATRIX_ROW (current_matrix, i - 1)->enabled_p - && (MATRIX_ROW (current_matrix, i - 1)->y - == MATRIX_ROW (desired_matrix, j - 1)->y) - && !MATRIX_ROW (desired_matrix, j - 1)->redraw_fringe_bitmaps_p + && MATRIX_ROW (current_matrix, j - 1)->enabled_p + && (MATRIX_ROW (current_matrix, j - 1)->y + == MATRIX_ROW (desired_matrix, i - 1)->y) + && !MATRIX_ROW (desired_matrix, i - 1)->redraw_fringe_bitmaps_p && row_equal_p (MATRIX_ROW (desired_matrix, i - 1), MATRIX_ROW (current_matrix, j - 1), 1)) --i, --j; diff --git a/src/doprnt.c b/src/doprnt.c index b7c1e4e68e2..166d396851a 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -26,7 +26,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ of the (`int') argument, suitable for display in an Emacs buffer. . For %s and %c, when field width is specified (e.g., %25s), it accounts for - the diplay width of each character, according to char-width-table. That + the display width of each character, according to char-width-table. That is, it does not assume that each character takes one column on display. . If the size of the buffer is not enough to produce the formatted string in diff --git a/src/emacs.c b/src/emacs.c index 5f3d126e13e..a5d2f619b8c 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1402,7 +1402,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #endif /* argmatch must not be used after here, - except when bulding temacs + except when building temacs because the -d argument has not been skipped in skip_args. */ #ifdef MSDOS diff --git a/src/font.c b/src/font.c index 30c39771fd6..cb27155f09d 100644 --- a/src/font.c +++ b/src/font.c @@ -162,7 +162,7 @@ static struct font_driver_list *font_driver_list; -/* Creaters of font-related Lisp object. */ +/* Creators of font-related Lisp object. */ static Lisp_Object font_make_spec (void) @@ -802,7 +802,7 @@ font_expand_wildcards (Lisp_Object *field, int n) struct { /* Minimum possible field. */ int from; - /* Maxinum possible field. */ + /* Maximum possible field. */ int to; /* Bit mask of possible field. Nth bit corresponds to Nth field. */ int mask; @@ -954,7 +954,7 @@ font_expand_wildcards (Lisp_Object *field, int n) } } - /* Decide all fileds from restrictions in RANGE. */ + /* Decide all fields from restrictions in RANGE. */ for (i = j = 0; i < n ; i++) { if (j < range[i].from) @@ -5147,7 +5147,7 @@ the corresponding glyph code. If ENCODING is a char-table, looking up the table by a character gives the corresponding glyph code. REPERTORY specifies a repertory of characters supported by the font. -If REPERTORY is a charset, all characters beloging to the charset are +If REPERTORY is a charset, all characters belonging to the charset are supported. If REPERTORY is a char-table, all characters who have a non-nil value in the table are supported. If REPERTORY is nil, Emacs gets the repertory information by an opened font and ENCODING. */); diff --git a/src/font.h b/src/font.h index 775c02b000f..f49f06a1fbc 100644 --- a/src/font.h +++ b/src/font.h @@ -599,7 +599,7 @@ struct font_driver /* Optional. Store bitmap data for glyph-code CODE of FONT in BITMAP. It is - intended that this method is callled from the other font-driver + intended that this method is called from the other font-driver for actual drawing. */ int (*get_bitmap) (struct font *font, unsigned code, struct font_bitmap *bitmap, diff --git a/src/fontset.c b/src/fontset.c index 891a89f8cd0..ae919468695 100644 --- a/src/fontset.c +++ b/src/fontset.c @@ -1090,7 +1090,7 @@ fontset_pattern_regexp (Lisp_Object pattern) nescs++; } - /* If PATTERN is not full XLFD we conert "*" to ".*". Otherwise + /* If PATTERN is not full XLFD we convert "*" to ".*". Otherwise we convert "*" to "[^-]*" which is much faster in regular expression matching. */ if (ndashes < 14) @@ -1704,7 +1704,7 @@ static Lisp_Object auto_fontset_alist; /* Number of automatically created fontsets. */ static ptrdiff_t num_auto_fontsets; -/* Retun a fontset synthesized from FONT-OBJECT. This is called from +/* Return a fontset synthesized from FONT-OBJECT. This is called from x_new_font when FONT-OBJECT is used for the default ASCII font of a frame, and the returned fontset is used for the default fontset of that frame. The fontset specifies a font of the same registry as @@ -1790,7 +1790,7 @@ update_auto_fontset_alist (Lisp_Object font_object, Lisp_Object fontset) /* Return a cons (FONT-OBJECT . GLYPH-CODE). FONT-OBJECT is the font for the character at POSITION in the current buffer. This is computed from all the text properties and overlays - that apply to POSITION. POSTION may be nil, in which case, + that apply to POSITION. POSITION may be nil, in which case, FONT-SPEC is the font for displaying the character CH with the default face. diff --git a/src/frame.c b/src/frame.c index 1b29bd8f085..dbee6a8092b 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1237,7 +1237,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) else { #ifdef HAVE_X_WINDOWS - /* Also, save clipboard to the the clipboard manager. */ + /* Also, save clipboard to the clipboard manager. */ x_clipboard_manager_save_frame (frame); #endif @@ -1320,7 +1320,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force) /* Mark all the windows that used to be on FRAME as deleted, and then remove the reference to them. */ - delete_all_subwindows (f->root_window); + delete_all_child_windows (f->root_window); f->root_window = Qnil; Vframe_list = Fdelq (frame, Vframe_list); @@ -1359,6 +1359,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force) /* If needed, delete the terminal that this frame was on. (This must be done after the frame is killed.) */ terminal->reference_count--; +#ifdef USE_GTK + /* FIXME: Deleting the terminal crashes emacs because of a GTK + bug. + http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg00363.html */ + if (terminal->reference_count == 0 && terminal->type == output_x_window) + terminal->reference_count = 1; +#endif /* USE_GTK */ if (terminal->reference_count == 0) { Lisp_Object tmp; @@ -2490,7 +2497,7 @@ If FRAME is omitted, the selected frame is used. The exact value of the result depends on the window-system and toolkit in use: In the Gtk+ version of Emacs, it includes only any window (including -the minibuffer or eacho area), mode line, and header line. It does not +the minibuffer or echo area), mode line, and header line. It does not include the tool bar or menu bar. With the Motif or Lucid toolkits, it also includes the tool bar (but diff --git a/src/frame.h b/src/frame.h index 574da5c3b52..598d9adc491 100644 --- a/src/frame.h +++ b/src/frame.h @@ -371,7 +371,7 @@ struct frame if greater than 1, then the frame is obscured - we still consider it to be "visible" as seen from lisp, but we don't bother updating it. We must take care to garbage the frame when it - ceaces to be obscured though. + ceases to be obscured though. iconified is nonzero if the frame is currently iconified. diff --git a/src/gtkutil.c b/src/gtkutil.c index e13a7540715..31cbd32f441 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -348,7 +348,7 @@ file_for_image (Lisp_Object image) /* For the image defined in IMG, make and return a GtkImage. For displays with 8 planes or less we must make a GdkPixbuf and apply the mask manually. - Otherwise the highlightning and dimming the tool bar code in GTK does + Otherwise the highlighting and dimming the tool bar code in GTK does will look bad. For display with more than 8 planes we just use the pixmap and mask directly. For monochrome displays, GTK doesn't seem able to use external pixmaps, it looks bad whatever we do. @@ -891,7 +891,7 @@ xg_frame_resized (FRAME_PTR f, int pixelwidth, int pixelheight) } } -/* Resize the outer window of frame F after chainging the height. +/* Resize the outer window of frame F after changing the height. COLUMNS/ROWS is the size the edit area shall have after the resize. */ void @@ -1423,7 +1423,7 @@ get_dialog_title (char key) /* Callback for dialogs that get WM_DELETE_WINDOW. We pop down the dialog, but return TRUE so the event does not propagate further in GTK. This prevents GTK from destroying the dialog widget automatically - and we can always destrou the widget manually, regardles of how + and we can always destroy the widget manually, regardless of how it was popped down (button press or WM_DELETE_WINDOW). W is the dialog widget. EVENT is the GdkEvent that represents WM_DELETE_WINDOW (not used). @@ -2294,7 +2294,7 @@ tearoff_activate (GtkWidget *widget, gpointer client_data) /* Create a menu item widget, and connect the callbacks. - ITEM decribes the menu item. + ITEM describes the menu item. F is the frame the created menu belongs to. SELECT_CB is the callback to use when a menu item is selected. HIGHLIGHT_CB is the callback to call when entering/leaving menu items. @@ -4237,7 +4237,7 @@ xg_make_tool_item (FRAME_PTR f, gtk_container_add (GTK_CONTAINER (weventbox), wb); gtk_container_add (GTK_CONTAINER (ti), weventbox); - if (wimage) + if (wimage || label) { intptr_t ii = i; gpointer gi = (gpointer) ii; @@ -4301,21 +4301,21 @@ xg_tool_item_stale_p (GtkWidget *wbutton, const char *stock_name, GtkWidget *wlbl = xg_get_tool_bar_widgets (vb, &wimage); /* Check if the tool icon matches. */ - if (stock_name) + if (stock_name && wimage) { old = g_object_get_data (G_OBJECT (wimage), XG_TOOL_BAR_STOCK_NAME); if (!old || strcmp (old, stock_name)) return 1; } - else if (icon_name) + else if (icon_name && wimage) { old = g_object_get_data (G_OBJECT (wimage), XG_TOOL_BAR_ICON_NAME); if (!old || strcmp (old, icon_name)) return 1; } - else + else if (wimage) { gpointer gold_img = g_object_get_data (G_OBJECT (wimage), XG_TOOL_BAR_IMAGE_DATA); @@ -4330,7 +4330,7 @@ xg_tool_item_stale_p (GtkWidget *wbutton, const char *stock_name, return 1; /* Ensure label is correct. */ - if (label) + if (label && wlbl) gtk_label_set_text (GTK_LABEL (wlbl), label); return 0; } diff --git a/src/image.c b/src/image.c index 4453d2aa8d8..fd842f3e347 100644 --- a/src/image.c +++ b/src/image.c @@ -7553,7 +7553,7 @@ imagemagick_image_p (Lisp_Object object) } /* The GIF library also defines DrawRectangle, but its never used in Emacs. - Therefore rename the function so it doesnt collide with ImageMagick. */ + Therefore rename the function so it doesn't collide with ImageMagick. */ #define DrawRectangle DrawRectangleGif #include <wand/MagickWand.h> @@ -7825,7 +7825,7 @@ imagemagick_load_image (struct frame *f, struct image *img, if (imagemagick_rendermethod == 1) { - /* Magicexportimage is normaly faster than pixelpushing. This + /* Magicexportimage is normally faster than pixelpushing. This method is also well tested. Some aspects of this method are ad-hoc and needs to be more researched. */ int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/ @@ -7842,7 +7842,7 @@ imagemagick_load_image (struct frame *f, struct image *img, } - /* Oddly, the below code doesnt seem to work:*/ + /* Oddly, the below code doesn't seem to work:*/ /* switch(ximg->bitmap_unit){ */ /* case 8: */ /* pixelwidth=CharPixel; */ @@ -7871,7 +7871,7 @@ imagemagick_load_image (struct frame *f, struct image *img, /*&(img->pixmap));*/ ximg->data); #else - image_error ("You dont have MagickExportImagePixels, upgrade ImageMagick!", + image_error ("You don't have MagickExportImagePixels, upgrade ImageMagick!", Qnil, Qnil); #endif } @@ -8782,7 +8782,7 @@ syms_of_image (void) operation on GNU/Linux of calling dump-emacs after loading some images. */ image_types = NULL; - /* Must be defined now becase we're going to update it below, while + /* Must be defined now because we're going to update it below, while defining the supported image types. */ DEFVAR_LISP ("image-types", Vimage_types, doc: /* List of potentially supported image types. diff --git a/src/indent.c b/src/indent.c index 7e2edc8713b..033d258c67e 100644 --- a/src/indent.c +++ b/src/indent.c @@ -1680,6 +1680,8 @@ compute_motion (ptrdiff_t from, EMACS_INT fromvpos, EMACS_INT fromhpos, int did_ val_compute_motion.prevhpos = contin_hpos; else val_compute_motion.prevhpos = prev_hpos; + /* We always handle all of them here; none of them remain to do. */ + val_compute_motion.ovstring_chars_done = 0; /* Nonzero if have just continued a line */ val_compute_motion.contin = (contin_hpos && prev_hpos == 0); diff --git a/src/insdel.c b/src/insdel.c index 0a9777ad95e..10d37c42592 100644 --- a/src/insdel.c +++ b/src/insdel.c @@ -1316,7 +1316,7 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new, UNGCPRO; - /* Make args be valid */ + /* Make args be valid. */ if (from < BEGV) from = BEGV; if (to > ZV) diff --git a/src/intervals.c b/src/intervals.c index e8ff5bce5b6..6f8dda4294e 100644 --- a/src/intervals.c +++ b/src/intervals.c @@ -1317,7 +1317,7 @@ interval_deletion_adjustment (register INTERVAL tree, register ptrdiff_t from, if (NULL_INTERVAL_P (tree)) return 0; - /* Left branch */ + /* Left branch. */ if (relative_position < LEFT_TOTAL_LENGTH (tree)) { ptrdiff_t subtract = interval_deletion_adjustment (tree->left, @@ -1327,7 +1327,7 @@ interval_deletion_adjustment (register INTERVAL tree, register ptrdiff_t from, CHECK_TOTAL_LENGTH (tree); return subtract; } - /* Right branch */ + /* Right branch. */ else if (relative_position >= (TOTAL_LENGTH (tree) - RIGHT_TOTAL_LENGTH (tree))) { @@ -1425,9 +1425,8 @@ adjust_intervals_for_deletion (struct buffer *buffer, compiler that does not allow calling a static function (here, adjust_intervals_for_deletion) from a non-static inline function. */ -static inline void -static_offset_intervals (struct buffer *buffer, ptrdiff_t start, - ptrdiff_t length) +void +offset_intervals (struct buffer *buffer, ptrdiff_t start, ptrdiff_t length) { if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) || length == 0) return; @@ -1440,12 +1439,6 @@ static_offset_intervals (struct buffer *buffer, ptrdiff_t start, adjust_intervals_for_deletion (buffer, start, -length); } } - -inline void -offset_intervals (struct buffer *buffer, ptrdiff_t start, ptrdiff_t length) -{ - static_offset_intervals (buffer, start, length); -} /* Merge interval I with its lexicographic successor. The resulting interval is returned, and has the properties of the original @@ -1706,54 +1699,37 @@ graft_intervals_into_buffer (INTERVAL source, ptrdiff_t position, Qnil, buf, 0); } if (! NULL_INTERVAL_P (BUF_INTERVALS (buffer))) - /* Shouldn't be necessary. -stef */ + /* Shouldn't be necessary. --Stef */ BUF_INTERVALS (buffer) = balance_an_interval (BUF_INTERVALS (buffer)); return; } - if (NULL_INTERVAL_P (tree)) - { - /* The inserted text constitutes the whole buffer, so + eassert (length == TOTAL_LENGTH (source)); + + if ((BUF_Z (buffer) - BUF_BEG (buffer)) == length) + { /* The inserted text constitutes the whole buffer, so simply copy over the interval structure. */ - if ((BUF_Z (buffer) - BUF_BEG (buffer)) == TOTAL_LENGTH (source)) - { Lisp_Object buf; XSETBUFFER (buf, buffer); BUF_INTERVALS (buffer) = reproduce_tree_obj (source, buf); - BUF_INTERVALS (buffer)->position = BEG; - BUF_INTERVALS (buffer)->up_obj = 1; - + BUF_INTERVALS (buffer)->position = BUF_BEG (buffer); + eassert (BUF_INTERVALS (buffer)->up_obj == 1); return; } - - /* Create an interval tree in which to place a copy + else if (NULL_INTERVAL_P (tree)) + { /* Create an interval tree in which to place a copy of the intervals of the inserted string. */ - { Lisp_Object buf; XSETBUFFER (buf, buffer); tree = create_root_interval (buf); } - } - else if (TOTAL_LENGTH (tree) == TOTAL_LENGTH (source)) - /* If the buffer contains only the new string, but - there was already some interval tree there, then it may be - some zero length intervals. Eventually, do something clever - about inserting properly. For now, just waste the old intervals. */ - { - BUF_INTERVALS (buffer) = reproduce_tree (source, INTERVAL_PARENT (tree)); - BUF_INTERVALS (buffer)->position = BEG; - BUF_INTERVALS (buffer)->up_obj = 1; - /* Explicitly free the old tree here. */ - - return; - } /* Paranoia -- the text has already been added, so this buffer should be of non-zero length. */ else if (TOTAL_LENGTH (tree) == 0) abort (); this = under = find_interval (tree, position); - if (NULL_INTERVAL_P (under)) /* Paranoia */ + if (NULL_INTERVAL_P (under)) /* Paranoia. */ abort (); over = find_interval (source, interval_start_pos (source)); @@ -1884,7 +1860,7 @@ lookup_char_property (Lisp_Object plist, register Lisp_Object prop, int textprop /* Set point in BUFFER "temporarily" to CHARPOS, which corresponds to byte position BYTEPOS. */ -inline void +void temp_set_point_both (struct buffer *buffer, ptrdiff_t charpos, ptrdiff_t bytepos) { @@ -1904,7 +1880,7 @@ temp_set_point_both (struct buffer *buffer, /* Set point "temporarily", without checking any text properties. */ -inline void +void temp_set_point (struct buffer *buffer, ptrdiff_t charpos) { temp_set_point_both (buffer, charpos, @@ -2393,7 +2369,7 @@ copy_intervals (INTERVAL tree, ptrdiff_t start, ptrdiff_t length) /* Give STRING the properties of BUFFER from POSITION to LENGTH. */ -inline void +void copy_intervals_to_string (Lisp_Object string, struct buffer *buffer, ptrdiff_t position, ptrdiff_t length) { diff --git a/src/intervals.h b/src/intervals.h index d7d156b42db..be0cc43d032 100644 --- a/src/intervals.h +++ b/src/intervals.h @@ -64,71 +64,71 @@ struct interval Lisp_Object plist; }; -/* These are macros for dealing with the interval tree. */ +/* These are macros for dealing with the interval tree. */ -/* Size of the structure used to represent an interval */ +/* Size of the structure used to represent an interval. */ #define INTERVAL_SIZE (sizeof (struct interval)) -/* Size of a pointer to an interval structure */ +/* Size of a pointer to an interval structure. */ #define INTERVAL_PTR_SIZE (sizeof (struct interval *)) #define NULL_INTERVAL_P(i) ((i) == NULL_INTERVAL) -/* True if this interval has no right child. */ +/* True if this interval has no right child. */ #define NULL_RIGHT_CHILD(i) ((i)->right == NULL_INTERVAL) -/* True if this interval has no left child. */ +/* True if this interval has no left child. */ #define NULL_LEFT_CHILD(i) ((i)->left == NULL_INTERVAL) -/* True if this interval has no parent. */ +/* True if this interval has no parent. */ #define NULL_PARENT(i) ((i)->up_obj || (i)->up.interval == 0) -/* True if this interval is the left child of some other interval. */ +/* True if this interval is the left child of some other interval. */ #define AM_LEFT_CHILD(i) (! NULL_PARENT (i) \ && INTERVAL_PARENT (i)->left == (i)) -/* True if this interval is the right child of some other interval. */ +/* True if this interval is the right child of some other interval. */ #define AM_RIGHT_CHILD(i) (! NULL_PARENT (i) \ && INTERVAL_PARENT (i)->right == (i)) -/* True if this interval has no children. */ +/* True if this interval has no children. */ #define LEAF_INTERVAL_P(i) ((i)->left == NULL_INTERVAL \ && (i)->right == NULL_INTERVAL) -/* True if this interval has no parent and is therefore the root. */ +/* True if this interval has no parent and is therefore the root. */ #define ROOT_INTERVAL_P(i) (NULL_PARENT (i)) -/* True if this interval is the only interval in the interval tree. */ +/* True if this interval is the only interval in the interval tree. */ #define ONLY_INTERVAL_P(i) (ROOT_INTERVAL_P ((i)) && LEAF_INTERVAL_P ((i))) -/* True if this interval has both left and right children. */ +/* True if this interval has both left and right children. */ #define BOTH_KIDS_P(i) ((i)->left != NULL_INTERVAL \ && (i)->right != NULL_INTERVAL) /* The total size of all text represented by this interval and all its - children in the tree. This is zero if the interval is null. */ + children in the tree. This is zero if the interval is null. */ #define TOTAL_LENGTH(i) ((i) == NULL_INTERVAL ? 0 : (i)->total_length) -/* The size of text represented by this interval alone. */ +/* The size of text represented by this interval alone. */ #define LENGTH(i) ((i) == NULL_INTERVAL ? 0 : (TOTAL_LENGTH ((i)) \ - TOTAL_LENGTH ((i)->right) \ - TOTAL_LENGTH ((i)->left))) /* The position of the character just past the end of I. Note that - the position cache i->position must be valid for this to work. */ + the position cache i->position must be valid for this to work. */ #define INTERVAL_LAST_POS(i) ((i)->position + LENGTH ((i))) -/* The total size of the left subtree of this interval. */ +/* The total size of the left subtree of this interval. */ #define LEFT_TOTAL_LENGTH(i) ((i)->left ? (i)->left->total_length : 0) -/* The total size of the right subtree of this interval. */ +/* The total size of the right subtree of this interval. */ #define RIGHT_TOTAL_LENGTH(i) ((i)->right ? (i)->right->total_length : 0) -/* These macros are for dealing with the interval properties. */ +/* These macros are for dealing with the interval properties. */ /* True if this is a default interval, which is the same as being null - or having no properties. */ + or having no properties. */ #define DEFAULT_INTERVAL_P(i) (NULL_INTERVAL_P (i) || EQ ((i)->plist, Qnil)) /* Test what type of parent we have. Three possibilities: another @@ -169,7 +169,7 @@ struct interval } \ while (0) -/* Reset this interval to its vanilla, or no-property state. */ +/* Reset this interval to its vanilla, or no-property state. */ #define RESET_INTERVAL(i) \ { \ (i)->total_length = (i)->position = 0; \ @@ -181,7 +181,7 @@ struct interval (i)->plist = Qnil; \ } -/* Copy the cached property values of interval FROM to interval TO. */ +/* Copy the cached property values of interval FROM to interval TO. */ #define COPY_INTERVAL_CACHE(from,to) \ { \ (to)->write_protect = (from)->write_protect; \ @@ -190,7 +190,7 @@ struct interval (to)->rear_sticky = (from)->rear_sticky; \ } -/* Copy only the set bits of FROM's cache. */ +/* Copy only the set bits of FROM's cache. */ #define MERGE_INTERVAL_CACHE(from,to) \ { \ if ((from)->write_protect) (to)->write_protect = 1; \ @@ -201,18 +201,18 @@ struct interval /* Macro determining whether the properties of an interval being inserted should be merged with the properties of the text where - they are being inserted. */ + they are being inserted. */ #define MERGE_INSERTIONS(i) 1 /* Macro determining if an invisible interval should be displayed - as a special glyph, or not at all. */ + as a special glyph, or not at all. */ #define DISPLAY_INVISIBLE_GLYPH(i) 0 -/* Is this interval visible? Replace later with cache access */ +/* Is this interval visible? Replace later with cache access. */ #define INTERVAL_VISIBLE_P(i) \ (! NULL_INTERVAL_P (i) && NILP (textget ((i)->plist, Qinvisible))) -/* Is this interval writable? Replace later with cache access */ +/* Is this interval writable? Replace later with cache access. */ #define INTERVAL_WRITABLE_P(i) \ (! NULL_INTERVAL_P (i) \ && (NILP (textget ((i)->plist, Qread_only)) \ @@ -222,7 +222,7 @@ struct interval : !NILP (Vinhibit_read_only))))) \ /* Macros to tell whether insertions before or after this interval - should stick to it. */ + should stick to it. */ /* Replace later with cache access */ /*#define FRONT_STICKY_P(i) ((i)->front_sticky != 0) #define END_STICKY_P(i) ((i)->rear_sticky != 0)*/ @@ -245,11 +245,11 @@ struct interval ? !NILP (prop) \ : invisible_p (prop, BVAR (current_buffer, invisibility_spec))) -/* Declared in alloc.c */ +/* Declared in alloc.c. */ extern INTERVAL make_interval (void); -/* Declared in intervals.c */ +/* Declared in intervals.c. */ extern INTERVAL create_root_interval (Lisp_Object); extern void copy_properties (INTERVAL, INTERVAL); @@ -288,12 +288,12 @@ extern INTERVAL validate_interval_range (Lisp_Object, Lisp_Object *, Lisp_Object *, int); extern INTERVAL interval_of (ptrdiff_t, Lisp_Object); -/* Defined in xdisp.c */ +/* Defined in xdisp.c. */ extern int invisible_p (Lisp_Object, Lisp_Object); -/* Declared in textprop.c */ +/* Declared in textprop.c. */ -/* Types of hooks. */ +/* Types of hooks. */ extern Lisp_Object Qpoint_left; extern Lisp_Object Qpoint_entered; extern Lisp_Object Qmodification_hooks; @@ -301,11 +301,11 @@ extern Lisp_Object Qcategory; extern Lisp_Object Qlocal_map; extern Lisp_Object Qkeymap; -/* Visual properties text (including strings) may have. */ +/* Visual properties text (including strings) may have. */ extern Lisp_Object Qfont; extern Lisp_Object Qinvisible, Qintangible; -/* Sticky properties */ +/* Sticky properties. */ extern Lisp_Object Qfront_sticky, Qrear_nonsticky; EXFUN (Fget_char_property, 3); diff --git a/src/keyboard.c b/src/keyboard.c index 239028c8bad..3b82c497650 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -930,7 +930,7 @@ pop_kboard (void) state later. If Emacs is already in single_kboard mode, and F's keyboard is - locked, then this function will throw an errow. */ + locked, then this function will throw an error. */ void temporarily_switch_to_single_kboard (struct frame *f) @@ -1058,7 +1058,7 @@ cmd_error_internal (Lisp_Object data, const char *context) struct frame *sf = SELECTED_FRAME (); /* The immediate context is not interesting for Quits, - since they are asyncronous. */ + since they are asynchronous. */ if (EQ (XCAR (data), Qquit)) Vsignaling_function = Qnil; @@ -5393,7 +5393,7 @@ make_lispy_event (struct input_event *event) || !lispy_function_keys[event->code - FUNCTION_KEY_OFFSET]) { /* We need to use an alist rather than a vector as the cache - since we can't make a vector long enuf. */ + since we can't make a vector long enough. */ if (NILP (KVAR (current_kboard, system_key_syms))) KVAR (current_kboard, system_key_syms) = Fcons (Qnil, Qnil); return modify_event_symbol (event->code, @@ -8137,7 +8137,7 @@ parse_tool_bar_item (Lisp_Object key, Lisp_Object item) Lisp_Object caption; int i, have_label = 0; - /* Defininition looks like `(menu-item CAPTION BINDING PROPS...)'. + /* Definition looks like `(menu-item CAPTION BINDING PROPS...)'. Rule out items that aren't lists, don't start with `menu-item' or whose rest following `tool-bar-item' is not a list. */ @@ -8787,7 +8787,7 @@ typedef struct keyremap /* Positions [START, END) in the key sequence buffer are the key that we have scanned so far. Those events are the ones that we will replace - if PAREHT maps them into a key sequence. */ + if PARENT maps them into a key sequence. */ int start, end; } keyremap; @@ -10861,8 +10861,12 @@ interrupt_signal (int signalnum) /* If we don't have an argument, some */ if (!terminal) { /* If there are no frames there, let's pretend that we are a - well-behaving UN*X program and quit. */ - Fkill_emacs (Qnil); + well-behaving UN*X program and quit. We cannot do that while + GC is in progress, though. */ + if (!gc_in_progress) + Fkill_emacs (Qnil); + else + Vquit_flag = Qt; } else { diff --git a/src/keymap.c b/src/keymap.c index 54134c67043..2a0f162a0e0 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -998,7 +998,7 @@ copy_keymap_item (Lisp_Object elt) } else { - /* It may be an old fomat menu item. + /* It may be an old format menu item. Skip the optional menu string. */ if (STRINGP (XCAR (tem))) { @@ -2642,11 +2642,11 @@ remapped command in the returned list. */) /* We have a list of advertised bindings. */ while (CONSP (tem)) if (EQ (shadow_lookup (keymaps, XCAR (tem), Qnil, 0), definition)) - return XCAR (tem); + RETURN_UNGCPRO (XCAR (tem)); else tem = XCDR (tem); if (EQ (shadow_lookup (keymaps, tem, Qnil, 0), definition)) - return tem; + RETURN_UNGCPRO (tem); } sequences = Freverse (where_is_internal (definition, keymaps, diff --git a/src/lisp.h b/src/lisp.h index 7b1be98bd22..648eb6430bd 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -168,6 +168,9 @@ extern int suppress_checking EXTERNALLY_VISIBLE; # if HAVE_ATTRIBUTE_ALIGNED # define DECL_ALIGN(type, var) \ type __attribute__ ((__aligned__ (1 << GCTYPEBITS))) var +# elif defined(_MSC_VER) +# define DECL_ALIGN(type, var) \ + type __declspec(align(1 << GCTYPEBITS)) var # else /* What directives do other compilers use? */ # endif @@ -225,6 +228,15 @@ extern int suppress_checking EXTERNALLY_VISIBLE; # endif #endif +/* Stolen from GDB. The only known compiler that doesn't support + enums in bitfields is MSVC. */ +#ifdef _MSC_VER +#define ENUM_BF(TYPE) unsigned int +#else +#define ENUM_BF(TYPE) enum TYPE +#endif + + enum Lisp_Type { /* Integer. XINT (obj) is the integer value. */ @@ -315,12 +327,12 @@ union Lisp_Object /* Use explict signed, the signedness of a bit-field of type int is implementation defined. */ signed EMACS_INT val : VALBITS; - enum Lisp_Type type : GCTYPEBITS; + ENUM_BF (Lisp_Type) type : GCTYPEBITS; } s; struct { EMACS_UINT val : VALBITS; - enum Lisp_Type type : GCTYPEBITS; + ENUM_BF (Lisp_Type) type : GCTYPEBITS; } u; } Lisp_Object; @@ -336,14 +348,14 @@ union Lisp_Object struct { - enum Lisp_Type type : GCTYPEBITS; + ENUM_BF (Lisp_Type) type : GCTYPEBITS; /* Use explict signed, the signedness of a bit-field of type int is implementation defined. */ signed EMACS_INT val : VALBITS; } s; struct { - enum Lisp_Type type : GCTYPEBITS; + ENUM_BF (Lisp_Type) type : GCTYPEBITS; EMACS_UINT val : VALBITS; } u; } @@ -1101,7 +1113,7 @@ struct Lisp_Symbol 1 : it's a varalias, the value is really in the `alias' symbol. 2 : it's a localized var, the value is in the `blv' object. 3 : it's a forwarding variable, the value is in `forward'. */ - enum symbol_redirect redirect : 3; + ENUM_BF (symbol_redirect) redirect : 3; /* Non-zero means symbol is constant, i.e. changing its value should signal an error. If the value is 3, then the var @@ -1314,7 +1326,7 @@ struct Lisp_Hash_Table struct Lisp_Misc_Any /* Supertype of all Misc types. */ { - enum Lisp_Misc_Type type : 16; /* = Lisp_Misc_??? */ + ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_??? */ unsigned gcmarkbit : 1; int spacer : 15; /* Make it as long as "Lisp_Free without padding". */ @@ -1323,7 +1335,7 @@ struct Lisp_Misc_Any /* Supertype of all Misc types. */ struct Lisp_Marker { - enum Lisp_Misc_Type type : 16; /* = Lisp_Misc_Marker */ + ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Marker */ unsigned gcmarkbit : 1; int spacer : 13; /* This flag is temporarily used in the functions @@ -1473,7 +1485,7 @@ struct Lisp_Overlay I.e. 9words plus 2 bits, 3words of which are for external linked lists. */ { - enum Lisp_Misc_Type type : 16; /* = Lisp_Misc_Overlay */ + ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Overlay */ unsigned gcmarkbit : 1; int spacer : 15; struct Lisp_Overlay *next; @@ -1492,7 +1504,7 @@ struct Lisp_Kboard_Objfwd This type of object is used in the arg to record_unwind_protect. */ struct Lisp_Save_Value { - enum Lisp_Misc_Type type : 16; /* = Lisp_Misc_Save_Value */ + ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Save_Value */ unsigned gcmarkbit : 1; int spacer : 14; /* If DOGC is set, POINTER is the address of a memory @@ -1506,7 +1518,7 @@ struct Lisp_Save_Value /* A miscellaneous object, when it's on the free list. */ struct Lisp_Free { - enum Lisp_Misc_Type type : 16; /* = Lisp_Misc_Free */ + ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Free */ unsigned gcmarkbit : 1; int spacer : 15; union Lisp_Misc *chain; @@ -1928,13 +1940,23 @@ typedef struct { /* This version of DEFUN declares a function prototype with the right arguments, so we can catch errors with maxargs at compile-time. */ -#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \ - Lisp_Object fnname DEFUN_ARGS_ ## maxargs ; \ - static DECL_ALIGN (struct Lisp_Subr, sname) = \ - { PVEC_SUBR, \ - { .a ## maxargs = fnname }, \ - minargs, maxargs, lname, intspec, 0}; \ - Lisp_Object fnname +#ifdef _MSC_VER +#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \ + Lisp_Object fnname DEFUN_ARGS_ ## maxargs ; \ + static DECL_ALIGN (struct Lisp_Subr, sname) = \ + { PVEC_SUBR | (sizeof (struct Lisp_Subr) / sizeof (EMACS_INT)), \ + { (Lisp_Object (__cdecl *)(void))fnname }, \ + minargs, maxargs, lname, intspec, 0}; \ + Lisp_Object fnname +#else /* not _MSC_VER */ +#define DEFUN(lname, fnname, sname, minargs, maxargs, intspec, doc) \ + Lisp_Object fnname DEFUN_ARGS_ ## maxargs ; \ + static DECL_ALIGN (struct Lisp_Subr, sname) = \ + { PVEC_SUBR, \ + { .a ## maxargs = fnname }, \ + minargs, maxargs, lname, intspec, 0}; \ + Lisp_Object fnname +#endif /* Note that the weird token-substitution semantics of ANSI C makes this work for MANY and UNEVALLED. */ @@ -3165,10 +3187,6 @@ extern void syms_of_fileio (void); extern Lisp_Object make_temp_name (Lisp_Object, int); extern Lisp_Object Qdelete_file; -/* Defined in abbrev.c */ - -extern void syms_of_abbrev (void); - /* Defined in search.c */ extern void shrink_regexp_cache (void); EXFUN (Fstring_match, 3); diff --git a/src/makefile.w32-in b/src/makefile.w32-in index 53cb5f857ab..36e4511d845 100644 --- a/src/makefile.w32-in +++ b/src/makefile.w32-in @@ -24,6 +24,9 @@ ALL = emacs # Set EMACSLOADPATH correctly (in case already defined in environment). EMACSLOADPATH=$(CURDIR)/../lisp +# Size in MBs of the static heap in temacs.exe. +HEAPSIZE = 27 + # # HAVE_CONFIG_H is required by some generic gnu sources stuck into # the emacs source tree. @@ -177,7 +180,7 @@ temacs: stamp_BLD $(TEMACS) $(TEMACS): $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \ ../nt/$(BLD)/addsection.exe $(GNULIB) $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS) - "../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP 21 + "$(THISDIR)/../nt/$(BLD)/addsection" "$(TEMACS_TMP)" "$(TEMACS)" EMHEAP $(HEAPSIZE) # These omit firstfile.${O}, but there's no documentation in there # anyways. @@ -232,7 +235,7 @@ globals.h: gl-stamp gl-stamp: ../lib-src/$(BLD)/make-docfile.exe $(GLOBAL_SOURCES) - $(DEL) gl-tmp - "../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp + "$(THISDIR)/../lib-src/$(BLD)/make-docfile" -d . -g $(SOME_MACHINE_OBJECTS) $(obj) > gl-tmp cmd /c "fc /b gl-tmp globals.h >nul 2>&1 || $(CP) gl-tmp globals.h" - $(DEL) gl-tmp echo timestamp > $@ @@ -348,11 +351,11 @@ TAGS-LISP: $(OBJ0) $(OBJ1) $(OBJ2) TAGS-gmake: ../lib-src/$(BLD)/etags.exe --include=TAGS-LISP --include=../nt/TAGS \ --regex=@../nt/emacs-src.tags \ - $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ0)) + $(OBJ0_c) ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ - $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ1)) + $(OBJ1_c) ../lib-src/$(BLD)/etags.exe -a --regex=@../nt/emacs-src.tags \ - $(patsubst $(BLD)%.$(O),$(CURDIR)%.c,$(OBJ2)) \ + $(OBJ2_c) \ $(CURDIR)/*.h $(CURDIR)/m/intel386.h $(CURDIR)/s/ms-w32.h TAGS-nmake: diff --git a/src/nsfns.m b/src/nsfns.m index 80da9d7a9ac..f320a909497 100644 --- a/src/nsfns.m +++ b/src/nsfns.m @@ -101,6 +101,10 @@ extern BOOL ns_in_resize; static Lisp_Object as_script, *as_result; static int as_status; +#if GLYPH_DEBUG +static ptrdiff_t image_cache_refcount; +#endif + /* ========================================================================== Internal utility functions @@ -1038,6 +1042,41 @@ frame_parm_handler ns_frame_parm_handlers[] = }; +/* Handler for signals raised during x_create_frame. + FRAME is the frame which is partially constructed. */ + +static Lisp_Object +unwind_create_frame (Lisp_Object frame) +{ + struct frame *f = XFRAME (frame); + + /* If frame is already dead, nothing to do. This can happen if the + display is disconnected after the frame has become official, but + before x_create_frame removes the unwind protect. */ + if (!FRAME_LIVE_P (f)) + return Qnil; + + /* If frame is ``official'', nothing to do. */ + if (NILP (Fmemq (frame, Vframe_list))) + { +#if GLYPH_DEBUG && XASSERTS + struct ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); +#endif + + x_free_frame_resources (f); + free_glyphs (f); + +#if GLYPH_DEBUG + /* Check that reference counts are indeed correct. */ + xassert (dpyinfo->terminal->image_cache->refcount == image_cache_refcount); +#endif + return Qt; + } + + return Qnil; +} + + /* ========================================================================== @@ -1047,46 +1086,50 @@ frame_parm_handler ns_frame_parm_handlers[] = DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame, 1, 1, 0, - doc: /* Make a new Nextstep window, called a \"frame\" in Emacs terms. + doc: /* Make a new Nextstep window, called a "frame" in Emacs terms. Return an Emacs frame object. PARMS is an alist of frame parameters. If the parameters specify that the frame should not have a minibuffer, and do not specify a specific minibuffer window to use, then `default-minibuffer-frame' must be a frame whose minibuffer can -be shared by the new frame. */) +be shared by the new frame. + +This function is an internal primitive--use `make-frame' instead. */) (Lisp_Object parms) { - static int desc_ctr = 1; struct frame *f; - struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; Lisp_Object frame, tem; Lisp_Object name; int minibuffer_only = 0; + int window_prompting = 0; + int width, height; ptrdiff_t count = specpdl_ptr - specpdl; + struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; Lisp_Object display; struct ns_display_info *dpyinfo = NULL; Lisp_Object parent; struct kboard *kb; Lisp_Object tfont, tfontsize; - int window_prompting = 0; - int width, height; + static int desc_ctr = 1; check_ns (); - /* Seems a little strange, but other terms do it. Perhaps the code below - is modifying something? */ + /* x_get_arg modifies parms. */ parms = Fcopy_alist (parms); + /* Use this general default value to start with + until we know if this frame has a specified name. */ + Vx_resource_name = Vinvocation_name; + display = x_get_arg (dpyinfo, parms, Qterminal, 0, 0, RES_TYPE_STRING); if (EQ (display, Qunbound)) display = Qnil; dpyinfo = check_ns_display_info (display); + kb = dpyinfo->terminal->kboard; if (!dpyinfo->terminal->name) error ("Terminal is not live, can't create new frames on it"); - kb = dpyinfo->terminal->kboard; - name = x_get_arg (dpyinfo, parms, Qname, 0, 0, RES_TYPE_STRING); if (!STRINGP (name) && ! EQ (name, Qunbound) @@ -1095,8 +1138,6 @@ be shared by the new frame. */) if (STRINGP (name)) Vx_resource_name = name; - else - Vx_resource_name = Vinvocation_name; parent = x_get_arg (dpyinfo, parms, Qparent_id, 0, 0, RES_TYPE_NUMBER); if (EQ (parent, Qunbound)) @@ -1104,57 +1145,36 @@ be shared by the new frame. */) if (! NILP (parent)) CHECK_NUMBER (parent); + /* make_frame_without_minibuffer can run Lisp code and garbage collect. */ + /* No need to protect DISPLAY because that's not used after passing + it to make_frame_without_minibuffer. */ frame = Qnil; GCPRO4 (parms, parent, name, frame); - tem = x_get_arg (dpyinfo, parms, Qminibuffer, "minibuffer", "Minibuffer", RES_TYPE_SYMBOL); if (EQ (tem, Qnone) || NILP (tem)) - { f = make_frame_without_minibuffer (Qnil, kb, display); - } else if (EQ (tem, Qonly)) { f = make_minibuffer_frame (); minibuffer_only = 1; } else if (WINDOWP (tem)) - { f = make_frame_without_minibuffer (tem, kb, display); - } else - { f = make_frame (1); - } - - /* Set the name; the functions to which we pass f expect the name to - be set. */ - if (EQ (name, Qunbound) || NILP (name) || (XTYPE (name) != Lisp_String)) - { - f->name = build_string ([ns_app_name UTF8String]); - f->explicit_name =0; - } - else - { - f->name = name; - f->explicit_name = 1; - specbind (Qx_resource_name, name); - } XSETFRAME (frame, f); FRAME_CAN_HAVE_SCROLL_BARS (f) = 1; f->terminal = dpyinfo->terminal; - f->terminal->reference_count++; f->output_method = output_ns; f->output_data.ns = (struct ns_output *)xmalloc (sizeof *(f->output_data.ns)); - memset (f->output_data.ns, 0, sizeof (*(f->output_data.ns))); + memset (f->output_data.ns, 0, sizeof *(f->output_data.ns)); FRAME_FONTSET (f) = -1; - /* record_unwind_protect (unwind_create_frame, frame); safety; maybe later? */ - f->icon_name = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title", RES_TYPE_STRING); if (! STRINGP (f->icon_name)) @@ -1162,6 +1182,9 @@ be shared by the new frame. */) FRAME_NS_DISPLAY_INFO (f) = dpyinfo; + /* With FRAME_NS_DISPLAY_INFO set up, this unwind-protect is safe. */ + record_unwind_protect (unwind_create_frame, frame); + f->output_data.ns->window_desc = desc_ctr++; if (TYPE_RANGED_INTEGERP (Window, parent)) { @@ -1174,6 +1197,20 @@ be shared by the new frame. */) f->output_data.ns->explicit_parent = 0; } + /* Set the name; the functions to which we pass f expect the name to + be set. */ + if (EQ (name, Qunbound) || NILP (name) || ! STRINGP (name)) + { + f->name = build_string ([ns_app_name UTF8String]); + f->explicit_name = 0; + } + else + { + f->name = name; + f->explicit_name = 1; + specbind (Qx_resource_name, name); + } + f->resx = dpyinfo->resx; f->resy = dpyinfo->resy; @@ -1223,11 +1260,15 @@ be shared by the new frame. */) "leftFringe", "LeftFringe", RES_TYPE_NUMBER); x_default_parameter (f, parms, Qright_fringe, Qnil, "rightFringe", "RightFringe", RES_TYPE_NUMBER); - /* end PENDING */ + +#if GLYPH_DEBUG + image_cache_refcount = + FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; +#endif init_frame_faces (f); - /* The X resources controlling the menu-bar and tool-bar are + /* The resources controlling the menu-bar and tool-bar are processed specially at startup, and reflected in the mode variables; ignore them here. */ x_default_parameter (f, parms, Qmenu_bar_lines, @@ -1244,38 +1285,6 @@ be shared by the new frame. */) x_default_parameter (f, parms, Qtitle, Qnil, "title", "Title", RES_TYPE_STRING); -/* TODO: other terms seem to get away w/o this complexity.. */ - if (NILP (Fassq (Qwidth, parms))) - { - Lisp_Object value - = x_get_arg (dpyinfo, parms, Qwidth, "width", "Width", - RES_TYPE_NUMBER); - if (! EQ (value, Qunbound)) - parms = Fcons (Fcons (Qwidth, value), parms); - } - if (NILP (Fassq (Qheight, parms))) - { - Lisp_Object value - = x_get_arg (dpyinfo, parms, Qheight, "height", "Height", - RES_TYPE_NUMBER); - if (! EQ (value, Qunbound)) - parms = Fcons (Fcons (Qheight, value), parms); - } - if (NILP (Fassq (Qleft, parms))) - { - Lisp_Object value - = x_get_arg (dpyinfo, parms, Qleft, "left", "Left", RES_TYPE_NUMBER); - if (! EQ (value, Qunbound)) - parms = Fcons (Fcons (Qleft, value), parms); - } - if (NILP (Fassq (Qtop, parms))) - { - Lisp_Object value - = x_get_arg (dpyinfo, parms, Qtop, "top", "Top", RES_TYPE_NUMBER); - if (! EQ (value, Qunbound)) - parms = Fcons (Fcons (Qtop, value), parms); - } - window_prompting = x_figure_window_size (f, parms, 1); tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN); @@ -1297,23 +1306,27 @@ be shared by the new frame. */) x_icon (f, parms); + /* ns_display_info does not have a reference_count. */ + f->terminal->reference_count++; + /* It is now ok to make the frame official even if we get an error below. The frame needs to be on Vframe_list or making it visible won't work. */ Vframe_list = Fcons (frame, Vframe_list); - /*FRAME_NS_DISPLAY_INFO (f)->reference_count++; */ - - x_default_parameter (f, parms, Qicon_type, Qnil, "bitmapIcon", "BitmapIcon", - RES_TYPE_SYMBOL); - x_default_parameter (f, parms, Qauto_raise, Qnil, "autoRaise", "AutoRaiseLower", - RES_TYPE_BOOLEAN); - x_default_parameter (f, parms, Qauto_lower, Qnil, "autoLower", "AutoLower", - RES_TYPE_BOOLEAN); - x_default_parameter (f, parms, Qcursor_type, Qbox, "cursorType", "CursorType", - RES_TYPE_SYMBOL); - x_default_parameter (f, parms, Qscroll_bar_width, Qnil, "scrollBarWidth", - "ScrollBarWidth", RES_TYPE_NUMBER); - x_default_parameter (f, parms, Qalpha, Qnil, "alpha", "Alpha", - RES_TYPE_NUMBER); + + x_default_parameter (f, parms, Qicon_type, Qnil, + "bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL); + + x_default_parameter (f, parms, Qauto_raise, Qnil, + "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN); + x_default_parameter (f, parms, Qauto_lower, Qnil, + "autoLower", "AutoLower", RES_TYPE_BOOLEAN); + x_default_parameter (f, parms, Qcursor_type, Qbox, + "cursorType", "CursorType", RES_TYPE_SYMBOL); + x_default_parameter (f, parms, Qscroll_bar_width, Qnil, + "scrollBarWidth", "ScrollBarWidth", + RES_TYPE_NUMBER); + x_default_parameter (f, parms, Qalpha, Qnil, + "alpha", "Alpha", RES_TYPE_NUMBER); width = FRAME_COLS (f); height = FRAME_LINES (f); @@ -1324,20 +1337,24 @@ be shared by the new frame. */) if (! f->output_data.ns->explicit_parent) { - tem = x_get_arg (dpyinfo, parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL); - if (EQ (tem, Qunbound)) - tem = Qt; - x_set_visibility (f, tem, Qnil); - if (EQ (tem, Qicon)) + Lisp_Object visibility; + + visibility = x_get_arg (dpyinfo, parms, Qvisibility, 0, 0, + RES_TYPE_SYMBOL); + if (EQ (visibility, Qunbound)) + visibility = Qt; + + if (EQ (visibility, Qicon)) x_iconify_frame (f); - else if (! NILP (tem)) + else if (! NILP (visibility)) { x_make_frame_visible (f); - f->async_visible = 1; [[FRAME_NS_VIEW (f) window] makeKeyWindow]; } else - f->async_visible = 0; + { + /* Must have been Qnil. */ + } } if (FRAME_HAS_MINIBUF_P (f) @@ -1352,6 +1369,9 @@ be shared by the new frame. */) f->param_alist = Fcons (XCAR (tem), f->param_alist); UNGCPRO; + + /* Make sure windows on this frame appear in calls to next-window + and similar functions. */ Vwindow_list = Qnil; return unbind_to (count, frame); @@ -1636,7 +1656,7 @@ If omitted or nil, the selected frame's display is used. */) DEFUN ("x-display-backing-store", Fx_display_backing_store, Sx_display_backing_store, 0, 1, 0, - doc: /* Return whether the Nexstep display DISPLAY supports backing store. + doc: /* Return whether the Nextstep display DISPLAY supports backing store. The value may be `buffered', `retained', or `non-retained'. DISPLAY should be a frame, the display name as a string, or a terminal ID. If omitted or nil, the selected frame's display is used. */) @@ -1826,7 +1846,7 @@ DEFUN ("ns-emacs-info-panel", Fns_emacs_info_panel, Sns_emacs_info_panel, DEFUN ("ns-font-name", Fns_font_name, Sns_font_name, 1, 1, 0, - doc: /* Determine font postscript or family name for font NAME. + doc: /* Determine font PostScript or family name for font NAME. NAME should be a string containing either the font name or an XLFD font descriptor. If string contains `fontset' and not `fontset-startup', it is left alone. */) diff --git a/src/nsterm.h b/src/nsterm.h index b54e182780a..574d31c962a 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -447,7 +447,7 @@ struct nsfont_info { struct font font; - char *name; /* postscript name, uniquely identifies on NS systems */ + char *name; /* PostScript name, uniquely identifies on NS systems */ float width; /* this and following metrics stored as float rather than int */ float height; float underpos; diff --git a/src/nsterm.m b/src/nsterm.m index a2ae5e69512..c5b28d57ac5 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -164,7 +164,7 @@ static Lisp_Object last_mouse_motion_frame; static EmacsScroller *last_mouse_scroll_bar = nil; static struct frame *ns_updating_frame; static NSView *focus_view = NULL; -static int ns_window_num =0; +static int ns_window_num = 0; static NSRect uRect; static BOOL gsaved = NO; BOOL ns_in_resize = NO; @@ -1123,12 +1123,10 @@ x_iconify_frame (struct frame *f) [[view window] miniaturize: NSApp]; } +/* Free X resources of frame F. */ void -x_destroy_window (struct frame *f) -/* -------------------------------------------------------------------------- - External: Delete the window - -------------------------------------------------------------------------- */ +x_free_frame_resources (struct frame *f) { NSView *view = FRAME_NS_VIEW (f); struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (f); @@ -1163,10 +1161,21 @@ x_destroy_window (struct frame *f) [[view window] close]; [view release]; - ns_window_num--; UNBLOCK_INPUT; } +void +x_destroy_window (struct frame *f) +/* -------------------------------------------------------------------------- + External: Delete the window + -------------------------------------------------------------------------- */ +{ + NSTRACE (x_destroy_window); + check_ns (); + x_free_frame_resources (f); + ns_window_num--; +} + void x_set_offset (struct frame *f, int xoff, int yoff, int change_grav) @@ -3026,7 +3035,7 @@ ns_dumpglyphs_image (struct glyph_string *s, NSRect r) /* Currently on NS img->mask is always 0. Since get_window_cursor_type specifies a hollow box cursor when on a non-masked image we never reach this clause. But we put it - in in antipication of better support for image masks on + in in anticipation of better support for image masks on NS. */ tdCol = ns_lookup_indexed_color (NS_FACE_FOREGROUND (face), s->f); } @@ -4494,7 +4503,7 @@ ns_term_shutdown (int sig) //ns_app_active=YES; ns_update_auto_hide_menu_bar (); - // No constrining takes place when the application is not active. + // No constraining takes place when the application is not active. ns_constrain_all_frames (); } - (void)applicationDidResignActive: (NSNotification *)notification diff --git a/src/process.c b/src/process.c index de2edad07bd..71da2e17670 100644 --- a/src/process.c +++ b/src/process.c @@ -3116,7 +3116,7 @@ usage: (make-network-process &rest ARGS) */) { struct hostent *host_info_ptr; - /* gethostbyname may fail with TRY_AGAIN, but we don't honour that, + /* gethostbyname may fail with TRY_AGAIN, but we don't honor that, as it may `hang' Emacs for a very long time. */ immediate_quit = 1; QUIT; @@ -5363,8 +5363,8 @@ send_process (volatile Lisp_Object proc, const char *volatile buf, sending a multibyte text, thus we must encode it by the original coding system specified for the current process. - Another reason we comming here is that the coding system - was just complemented and new one was returned by + Another reason we come here is that the coding system + was just complemented and a new one was returned by complement_process_encoding_system. */ setup_coding_system (p->encode_coding_system, coding); Vlast_coding_system_used = p->encode_coding_system; @@ -5373,6 +5373,7 @@ send_process (volatile Lisp_Object proc, const char *volatile buf, } else { + coding->src_multibyte = 0; /* For sending a unibyte text, character code conversion should not take place but EOL conversion should. So, setup raw-text or one of the subsidiary if we have not yet done it. */ diff --git a/src/ralloc.c b/src/ralloc.c index 50d322523c1..62189ad8fc7 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -219,13 +219,13 @@ find_heap (POINTER address) If enough space is not presently available in our reserve, this means getting more page-aligned space from the system. If the returned space is not contiguous to the last heap, allocate a new heap, and append it + to the heap list. - obtain does not try to keep track of whether space is in use - or not in use. It just returns the address of SIZE bytes that - fall within a single heap. If you call obtain twice in a row - with the same arguments, you typically get the same value. - to the heap list. It's the caller's responsibility to keep - track of what space is in use. + obtain does not try to keep track of whether space is in use or not + in use. It just returns the address of SIZE bytes that fall within a + single heap. If you call obtain twice in a row with the same arguments, + you typically get the same value. It's the caller's responsibility to + keep track of what space is in use. Return the address of the space if all went well, or zero if we couldn't allocate the memory. */ @@ -389,7 +389,7 @@ find_bloc (POINTER *ptr) while (p != NIL_BLOC) { /* Consistency check. Don't return inconsistent blocs. - Don't abort here, as callers might be expecting this, but + Don't abort here, as callers might be expecting this, but callers that always expect a bloc to be returned should abort if one isn't to avoid a memory corruption bug that is difficult to track down. */ @@ -1180,7 +1180,7 @@ r_alloc_reset_variable (POINTER *old, POINTER *new) /* Find the bloc that corresponds to the data pointed to by pointer. find_bloc cannot be used, as it has internal consistency checks - which fail when the variable needs reseting. */ + which fail when the variable needs resetting. */ while (bloc != NIL_BLOC) { if (bloc->data == *new) diff --git a/src/regex.c b/src/regex.c index 8033ab9edaa..b7699378f5a 100644 --- a/src/regex.c +++ b/src/regex.c @@ -530,7 +530,11 @@ init_syntax_once (void) #define MIN(a, b) ((a) < (b) ? (a) : (b)) /* Type of source-pattern and string chars. */ +#ifdef _MSC_VER +typedef unsigned char re_char; +#else typedef const unsigned char re_char; +#endif typedef char boolean; #define false 0 @@ -633,7 +637,7 @@ typedef enum on_failure_jump_nastyloop, /* A smart `on_failure_jump' used for greedy * and + operators. - It analyses the loop before which it is put and if the + It analyzes the loop before which it is put and if the loop does not require backtracking, it changes itself to `on_failure_keep_string_jump' and short-circuits the loop, else it just defaults to changing itself into `on_failure_jump'. diff --git a/src/regex.h b/src/regex.h index 7747ec57629..eba62f2e769 100644 --- a/src/regex.h +++ b/src/regex.h @@ -415,7 +415,7 @@ struct re_pattern_buffer typedef struct re_pattern_buffer regex_t; /* Type for byte offsets within the string. POSIX mandates this to be an int, - but the Open Group has signalled its intention to change the requirement to + but the Open Group has signaled its intention to change the requirement to be that regoff_t be at least as wide as ptrdiff_t and ssize_t. Current gnulib sources also use ssize_t, and we need this for supporting buffers and strings > 2GB on 64-bit hosts. */ diff --git a/src/s/gnu.h b/src/s/gnu.h index c40f764f8bf..b40f7b0a95b 100644 --- a/src/s/gnu.h +++ b/src/s/gnu.h @@ -44,3 +44,5 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #endif /* !_IO_STDIO_H */ #endif /* emacs */ +/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack. */ +#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h index 1cd91a41b55..37199bcc29b 100644 --- a/src/s/hpux10-20.h +++ b/src/s/hpux10-20.h @@ -89,7 +89,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #undef HAVE_RANDOM -/* Rainer Malzbender <rainer@displaytech.com> says definining +/* Rainer Malzbender <rainer@displaytech.com> says defining HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ #ifndef HAVE_XRMSETDATABASE #define HAVE_XRMSETDATABASE diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h index 813c3cef115..fb0882860d1 100644 --- a/src/s/ms-w32.h +++ b/src/s/ms-w32.h @@ -86,6 +86,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP (_c_)) #include <sys/types.h> + +#ifdef _MSC_VER +typedef unsigned long sigset_t; +typedef int ssize_t; +#endif + struct sigaction { int sa_flags; void (*sa_handler)(int); @@ -181,6 +187,17 @@ struct sigaction { #ifdef emacs +#ifdef _MSC_VER +#include <sys/timeb.h> +#include <sys/stat.h> +#include <signal.h> + +/* MSVC gets link-time errors without these redirections. */ +#define fstat(a, b) sys_fstat(a, b) +#define stat(a, b) sys_stat(a, b) +#define utime sys_utime +#endif + /* Calls that are emulated or shadowed. */ #undef access #define access sys_access @@ -267,6 +284,7 @@ typedef int pid_t; #if !defined (_MSC_VER) || (_MSC_VER < 1400) #define tzname _tzname +#undef utime #define utime _utime #endif @@ -317,13 +335,17 @@ extern char *get_emacs_configuration_options (void); #define _WINSOCK_H /* Defines size_t and alloca (). */ -#ifdef USE_CRT_DLL +#if (defined(_MSC_VER) && defined(emacs)) || defined(USE_CRT_DLL) #define malloc e_malloc #define free e_free #define realloc e_realloc #define calloc e_calloc #endif +#ifdef _MSC_VER +#define alloca _alloca +#else #include <malloc.h> +#endif #include <sys/stat.h> diff --git a/src/s/msdos.h b/src/s/msdos.h index 29ca0629899..9ee13d12867 100644 --- a/src/s/msdos.h +++ b/src/s/msdos.h @@ -119,7 +119,7 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ #ifdef HAVE_X_WINDOWS /* We need a little extra space, see ../../lisp/loadup.el and the commentary below, in the non-X branch. The 140KB number was - measured on GNU/Linux and on MS-WIndows. */ + measured on GNU/Linux and on MS-Windows. */ #define SYSTEM_PURESIZE_EXTRA (-170000+140000) #else /* We need a little extra space, see ../../lisp/loadup.el. @@ -138,4 +138,3 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */ registers relevant for conservative garbage collection in the jmp_buf. */ #define GC_SETJMP_WORKS 1 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS - diff --git a/src/sound.c b/src/sound.c index b95fa82202f..9e15caae3ea 100644 --- a/src/sound.c +++ b/src/sound.c @@ -226,7 +226,7 @@ struct sound_device /* Close device SD. */ void (* close) (struct sound_device *sd); - /* Configure SD accoring to device-dependent parameters. */ + /* Configure SD according to device-dependent parameters. */ void (* configure) (struct sound_device *device); /* Choose a device-dependent format for outputting sound S. */ diff --git a/src/syssignal.h b/src/syssignal.h index 7533a5a64fd..315400d8498 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -39,7 +39,7 @@ extern sigset_t empty_mask; /* POSIX pretty much destroys any possibility of writing sigmask as a macro in standard C. We always define our own version because the - predefined macro in Glibc 2.1 is only provided for compatility for old + predefined macro in Glibc 2.1 is only provided for compatibility for old programs that use int as signal mask type. */ #undef sigmask #ifdef __GNUC__ diff --git a/src/unexelf.c b/src/unexelf.c index 979d6dce629..04c029f7e80 100644 --- a/src/unexelf.c +++ b/src/unexelf.c @@ -1019,7 +1019,7 @@ temacs: /* The conditional bit below was in Oliva's original code (1999-08-25) and seems to have been dropped by mistake subsequently. It prevents a crash at startup under X in - `IRIX64 6.5 6.5.17m', whether compiled on that relase or + `IRIX64 6.5 6.5.17m', whether compiled on that release or an earlier one. It causes no trouble on the other ELF platforms I could test (Irix 6.5.15m, Solaris 8, Debian Potato x86, Debian Woody SPARC); however, it's reported diff --git a/src/w32.c b/src/w32.c index 42546fc8d49..b2b47dbd179 100644 --- a/src/w32.c +++ b/src/w32.c @@ -94,7 +94,9 @@ typedef struct _MEMORY_STATUS_EX { #include <tlhelp32.h> #include <psapi.h> +#ifndef _MSC_VER #include <w32api.h> +#endif #if !defined (__MINGW32__) || __W32API_MAJOR_VERSION < 3 || (__W32API_MAJOR_VERSION == 3 && __W32API_MINOR_VERSION < 15) /* This either is not in psapi.h or guarded by higher value of _WIN32_WINNT than what we use. w32api supplied with MinGW 3.15 @@ -1547,7 +1549,12 @@ init_environment (char ** argv) read-only filesystem, like CD-ROM or a write-protected floppy. The only way to be really sure is to actually create a file and see if it succeeds. But I think that's too much to ask. */ +#ifdef _MSC_VER + /* MSVC's _access crashes with D_OK. */ + if (tmp && sys_access (tmp, D_OK) == 0) +#else if (tmp && _access (tmp, D_OK) == 0) +#endif { char * var = alloca (strlen (tmp) + 8); sprintf (var, "TMPDIR=%s", tmp); @@ -3396,7 +3403,7 @@ stat (const char * path, struct stat * buf) FILE_FLAG_BACKUP_SEMANTICS, NULL)) != INVALID_HANDLE_VALUE) { - /* This is more accurate in terms of gettting the correct number + /* This is more accurate in terms of getting the correct number of links, but is quite slow (it is noticeable when Emacs is making a list of file name completions). */ BY_HANDLE_FILE_INFORMATION info; @@ -5777,7 +5784,10 @@ check_windows_init_file (void) it cannot find the Windows installation file. If this file does not exist in the expected place, tell the user. */ - if (!noninteractive && !inhibit_window_system) + if (!noninteractive && !inhibit_window_system + /* Vload_path is not yet initialized when we are loading + loadup.el. */ + && NILP (Vpurify_flag)) { Lisp_Object objs[2]; Lisp_Object full_load_path; diff --git a/src/w32fns.c b/src/w32fns.c index 92fcac92c4e..aa4650dd7b2 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -140,8 +140,8 @@ struct MONITOR_INFO DWORD dwFlags; }; -/* Reportedly, VS 6 does not have this in its headers. */ -#if defined (_MSC_VER) && _MSC_VER < 1300 +/* Reportedly, MSVC does not have this in its headers. */ +#ifdef _MSC_VER DECLARE_HANDLE(HMONITOR); #endif @@ -2088,7 +2088,7 @@ w32_key_to_modifier (int key) key_mapping = Qnil; } - /* NB. This code runs in the input thread, asychronously to the lisp + /* NB. This code runs in the input thread, asynchronously to the lisp thread, so we must be careful to ensure access to lisp data is thread-safe. The following code is safe because the modifier variable values are updated atomically from lisp and symbols are @@ -3977,7 +3977,7 @@ x_make_gc (struct frame *f) /* Handler for signals raised during x_create_frame and - x_create_top_frame. FRAME is the frame which is partially + x_create_tip_frame. FRAME is the frame which is partially constructed. */ static Lisp_Object @@ -3986,13 +3986,14 @@ unwind_create_frame (Lisp_Object frame) struct frame *f = XFRAME (frame); /* If frame is ``official'', nothing to do. */ - if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame)) + if (NILP (Fmemq (frame, Vframe_list))) { #if GLYPH_DEBUG struct w32_display_info *dpyinfo = FRAME_W32_DISPLAY_INFO (f); #endif x_free_frame_resources (f); + free_glyphs (f); #if GLYPH_DEBUG /* Check that reference counts are indeed correct. */ @@ -4134,7 +4135,6 @@ This function is an internal primitive--use `make-frame' instead. */) FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = GetSystemMetrics (SM_CXVSCROLL); f->terminal = dpyinfo->terminal; - f->terminal->reference_count++; f->output_method = output_w32; f->output_data.w32 = @@ -4153,7 +4153,8 @@ This function is an internal primitive--use `make-frame' instead. */) /* With FRAME_X_DISPLAY_INFO set up, this unwind-protect is safe. */ record_unwind_protect (unwind_create_frame, frame); #if GLYPH_DEBUG - image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount; + image_cache_refcount = + FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ @@ -4286,6 +4287,7 @@ This function is an internal primitive--use `make-frame' instead. */) x_make_gc (f); /* Now consider the frame official. */ + f->terminal->reference_count++; FRAME_W32_DISPLAY_INFO (f)->reference_count++; Vframe_list = Fcons (frame, Vframe_list); @@ -5228,7 +5230,6 @@ x_create_tip_frame (struct w32_display_info *dpyinfo, from this point on, x_destroy_window might screw up reference counts etc. */ f->terminal = dpyinfo->terminal; - f->terminal->reference_count++; f->output_method = output_w32; f->output_data.w32 = (struct w32_output *) xmalloc (sizeof (struct w32_output)); @@ -5238,7 +5239,8 @@ x_create_tip_frame (struct w32_display_info *dpyinfo, f->icon_name = Qnil; #if GLYPH_DEBUG - image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount; + image_cache_refcount = + FRAME_IMAGE_CACHE ? FRAME_IMAGE_CACHE (f)->refcount : 0; dpyinfo_refcount = dpyinfo->reference_count; #endif /* GLYPH_DEBUG */ FRAME_KBOARD (f) = kb; @@ -5379,15 +5381,16 @@ x_create_tip_frame (struct w32_display_info *dpyinfo, UNGCPRO; + /* Now that the frame is official, it counts as a reference to + its display. */ + FRAME_W32_DISPLAY_INFO (f)->reference_count++; + f->terminal->reference_count++; + /* It is now ok to make the frame official even if we get an error below. And the frame needs to be on Vframe_list or making it visible won't work. */ Vframe_list = Fcons (frame, Vframe_list); - /* Now that the frame is official, it counts as a reference to - its display. */ - FRAME_W32_DISPLAY_INFO (f)->reference_count++; - /* Setting attributes of faces of the tooltip frame from resources and similar will increment face_change_count, which leads to the clearing of all current matrices. Since this isn't necessary @@ -6706,7 +6709,7 @@ DEFUN ("default-printer-name", Fdefault_printer_name, Sdefault_printer_name, ClosePrinter (hPrn); return Qnil; } - /* Call GetPrinter again with big enouth memory block */ + /* Call GetPrinter again with big enough memory block. */ err = GetPrinter (hPrn, 2, (LPBYTE)ppi2, dwNeeded, &dwReturned); ClosePrinter (hPrn); if (!err) diff --git a/src/w32font.c b/src/w32font.c index 6c1b4d0bc20..bd58e7e757b 100644 --- a/src/w32font.c +++ b/src/w32font.c @@ -330,7 +330,7 @@ w32font_list (Lisp_Object frame, Lisp_Object font_spec) /* w32 implementation of match for font backend. Return a font entity most closely matching with FONT_SPEC on - FRAME. The closeness is detemined by the font backend, thus + FRAME. The closeness is determined by the font backend, thus `face-font-selection-order' is ignored here. */ static Lisp_Object w32font_match (Lisp_Object frame, Lisp_Object font_spec) @@ -1284,14 +1284,23 @@ font_matches_spec (DWORD type, NEWTEXTMETRICEX *font, { /* Only truetype fonts will have information about what scripts they support. This probably means the user - will have to force Emacs to use raster, postscript - or atm fonts for non-ASCII text. */ + will have to force Emacs to use raster, PostScript + or ATM fonts for non-ASCII text. */ if (type & TRUETYPE_FONTTYPE) { Lisp_Object support = font_supported_scripts (&font->ntmFontSig); if (! memq_no_quit (val, support)) return 0; + + /* Avoid using non-Japanese fonts for Japanese, even + if they claim they are capable, due to known + breakage in Vista and Windows 7 fonts + (bug#6029). */ + if (EQ (val, Qkana) + && (font->ntmTm.tmCharSet != SHIFTJIS_CHARSET + || !(font->ntmFontSig.fsCsb[0] & CSB_JAPANESE))) + return 0; } else { @@ -1455,7 +1464,7 @@ check_face_name (LOGFONT *font, char *full_name) /* Helvetica is mapped to Arial in Windows, but if a Type-1 Helvetica is installed, we run into problems with the Uniscribe backend which tries to avoid non-truetype fonts, and ends up mixing the Type-1 Helvetica - with Arial's characteristics, since that attempt to use Truetype works + with Arial's characteristics, since that attempt to use TrueType works some places, but not others. */ if (!xstrcasecmp (font->lfFaceName, "helvetica")) { @@ -1483,7 +1492,7 @@ check_face_name (LOGFONT *font, char *full_name) /* Callback function for EnumFontFamiliesEx. - * Checks if a font matches everything we are trying to check agaist, + * Checks if a font matches everything we are trying to check against, * and if so, adds it to a list. Both the data we are checking against * and the list to which the fonts are added are passed in via the * lparam argument, in the form of a font_callback_data struct. */ @@ -1507,7 +1516,7 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, /* For uniscribe backend, consider only truetype or opentype fonts that have some unicode coverage. */ if (match_data->opentype_only - && ((!physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE + && ((!(physical_font->ntmTm.ntmFlags & NTMFLAGS_OPENTYPE) && !(font_type & TRUETYPE_FONTTYPE)) || !is_unicode)) return 1; @@ -1568,8 +1577,8 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, the bits for CJK ranges that include those characters. */ else if (EQ (spec_charset, Qunicode_sip)) { - if (!physical_font->ntmFontSig.fsUsb[1] & 0x02000000 - || !physical_font->ntmFontSig.fsUsb[1] & 0x28000000) + if (!(physical_font->ntmFontSig.fsUsb[1] & 0x02000000) + || !(physical_font->ntmFontSig.fsUsb[1] & 0x28000000)) return 1; } @@ -1577,8 +1586,16 @@ add_font_entity_to_list (ENUMLOGFONTEX *logical_font, /* If registry was specified, ensure it is reported as the same. */ if (!NILP (spec_charset)) - ASET (entity, FONT_REGISTRY_INDEX, spec_charset); - + { + /* Avoid using non-Japanese fonts for Japanese, even if they + claim they are capable, due to known breakage in Vista + and Windows 7 fonts (bug#6029). */ + if (logical_font->elfLogFont.lfCharSet == SHIFTJIS_CHARSET + && !(physical_font->ntmFontSig.fsCsb[0] & CSB_JAPANESE)) + return 1; + else + ASET (entity, FONT_REGISTRY_INDEX, spec_charset); + } /* Otherwise if using the uniscribe backend, report ANSI and DEFAULT fonts as unicode and skip other charsets. */ else if (match_data->opentype_only) @@ -2204,7 +2221,7 @@ font_supported_scripts (FONTSIGNATURE * sig) so don't need to mark them separately. */ /* 1: Latin-1 supplement, 2: Latin Extended A, 3: Latin Extended B. */ SUBRANGE (4, Qphonetic); - /* 5: Spacing and tone modifiers, 6: Combining Diacriticals. */ + /* 5: Spacing and tone modifiers, 6: Combining Diacritical Marks. */ SUBRANGE (7, Qgreek); SUBRANGE (8, Qcoptic); SUBRANGE (9, Qcyrillic); @@ -2294,7 +2311,7 @@ font_supported_scripts (FONTSIGNATURE * sig) /* 115: Saurashtra, 116: Kayah Li, 117: Rejang. */ SUBRANGE (118, Qcham); /* 119: Ancient symbols, 120: Phaistos Disc. */ - /* 121: Carian, Lycian, Lydian, 122: Dominos, Mah Jong tiles. */ + /* 121: Carian, Lycian, Lydian, 122: Dominoes, Mahjong tiles. */ /* 123-127: Reserved. */ /* There isn't really a main symbol range, so include symbol if any diff --git a/src/w32font.h b/src/w32font.h index 45c06897195..f77866b869f 100644 --- a/src/w32font.h +++ b/src/w32font.h @@ -20,8 +20,8 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define EMACS_W32FONT_H -/* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for Postscript OpenType fonts, - bit 18 for Truetype OpenType fonts, bit 20 for Type1 fonts. */ +/* Bit 17 of ntmFlags in NEWTEXTMETRIC is set for PostScript OpenType fonts, + bit 18 for TrueType OpenType fonts, bit 20 for Type1 fonts. */ #ifndef NTM_PS_OPENTYPE #define NTM_PS_OPENTYPE 0x00020000 #endif @@ -84,4 +84,3 @@ int uniscribe_check_otf (LOGFONT *font, Lisp_Object otf_spec); Lisp_Object intern_font_name (char *); #endif - diff --git a/src/w32menu.c b/src/w32menu.c index 98b053a9e23..93194b68018 100644 --- a/src/w32menu.c +++ b/src/w32menu.c @@ -1443,7 +1443,7 @@ add_menu_item (HMENU menu, widget_value *wv, HMENU item) out_string = (char *) local_alloc (strlen (wv->name) + 1); strcpy (out_string, wv->name); #ifdef MENU_DEBUG - DebPrint ("Menu: allocing %ld for owner-draw", out_string); + DebPrint ("Menu: allocating %ld for owner-draw", out_string); #endif fuFlags = MF_OWNERDRAW | MF_DISABLED; } diff --git a/src/w32proc.c b/src/w32proc.c index 47cbf57d9ea..279816bcc3e 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -174,7 +174,7 @@ delete_child (child_process *cp) cp->status = STATUS_READ_ERROR; SetEvent (cp->char_consumed); #if 0 - /* We used to forceably terminate the thread here, but it + /* We used to forcibly terminate the thread here, but it is normally unnecessary, and in abnormal cases, the worst that will happen is we have an extra idle thread hanging around waiting for the zombie process. */ @@ -241,7 +241,8 @@ reader_thread (void *arg) /* We have to wait for the go-ahead before we can start */ if (cp == NULL - || WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0) + || WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0 + || cp->fd < 0) return 1; for (;;) @@ -2295,7 +2296,7 @@ filesystems via ange-ftp. */); doc: /* Non-nil means attempt to fake realistic inode values. This works by hashing the truename of files, and should detect aliasing between long and short (8.3 DOS) names, but can have -false positives because of hash collisions. Note that determing +false positives because of hash collisions. Note that determining the truename of a file can be slow. */); Vw32_generate_fake_inodes = Qnil; #endif @@ -2319,4 +2320,3 @@ where the performance impact may be noticeable even on modern hardware. */); staticpro (&Vw32_valid_codepages); } /* end of w32proc.c */ - diff --git a/src/w32term.c b/src/w32term.c index 39f1e245e18..e9fa16ba325 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -3287,7 +3287,7 @@ w32_mouse_position (FRAME_PTR *fp, int insist, Lisp_Object *bar_window, /* Handle mouse button event on the tool-bar of frame F, at frame-relative coordinates X/Y. EVENT_TYPE is either ButtionPress - or ButtonRelase. */ + or ButtonRelease. */ static void w32_handle_tool_bar_click (struct frame *f, struct input_event *button_event) @@ -5690,15 +5690,15 @@ x_make_frame_visible (struct frame *f) f->output_data.w32->asked_for_visible = 1; - /* The first of these seems to give more expected behavior, but - was added as a commented out line in Sept 1997, with the - second version remaining uncommented. There may have been - some problem with it that led to it not being enabled, - so the old version remains commented out below in case we - decide we need to go back to it [23.0.60 2008-06-09]. */ + /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL + causes unexpected behavior when unminimizing frames that were + previously maximised. But only SW_SHOWNORMAL works properly for + frames that were truely hidden (using make-frame-invisible), so + we need it to avoid Bug#5482. It seems that async_iconified + is only set for minimised windows that are still visible, so + use that to determine the appropriate flag to pass ShowWindow. */ my_show_window (f, FRAME_W32_WINDOW (f), - f->async_iconified ? SW_RESTORE : SW_SHOW); - /* my_show_window (f, FRAME_W32_WINDOW (f), SW_SHOWNORMAL); */ + f->async_iconified ? SW_RESTORE : SW_SHOWNORMAL); } /* Synchronize to ensure Emacs knows the frame is visible diff --git a/src/w32term.h b/src/w32term.h index 710394583e4..02392133837 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -637,7 +637,7 @@ extern void x_delete_display (struct w32_display_info *dpyinfo); /* Keypad command key support. W32 doesn't have virtual keys defined for the function keys on the keypad (they are mapped to the standard - fuction keys), so we define our own. */ + function keys), so we define our own. */ #define VK_NUMPAD_BEGIN 0x92 #define VK_NUMPAD_CLEAR (VK_NUMPAD_BEGIN + 0) #define VK_NUMPAD_ENTER (VK_NUMPAD_BEGIN + 1) diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c index f6347bb88f7..36197b3b28a 100644 --- a/src/w32uniscribe.c +++ b/src/w32uniscribe.c @@ -507,7 +507,7 @@ uniscribe_encode_char (struct font *font, int c) if (SUCCEEDED (result) && nglyphs == 1) { /* Some fonts return .notdef glyphs instead of failing. - (Truetype spec reserves glyph code 0 for .notdef) */ + (TrueType spec reserves glyph code 0 for .notdef) */ if (glyphs[0]) code = glyphs[0]; } @@ -961,4 +961,3 @@ syms_of_w32uniscribe (void) register_font_driver (&uniscribe_font_driver, NULL); } - diff --git a/src/window.c b/src/window.c index 5ed7db2c916..60d17c74de3 100644 --- a/src/window.c +++ b/src/window.c @@ -159,7 +159,8 @@ DEFUN ("windowp", Fwindowp, Swindowp, 1, 1, 0, DEFUN ("window-live-p", Fwindow_live_p, Swindow_live_p, 1, 1, 0, doc: /* Return t if OBJECT is a live window and nil otherwise. -A live window is a window that displays a buffer. */) +A live window is a window that displays a buffer. +Internal windows and deleted windows are not live. */) (Lisp_Object object) { return WINDOW_LIVE_P (object) ? Qt : Qnil; @@ -168,7 +169,7 @@ A live window is a window that displays a buffer. */) /* Frames and windows. */ DEFUN ("window-frame", Fwindow_frame, Swindow_frame, 1, 1, 0, doc: /* Return the frame that window WINDOW is on. -WINDOW can be any window and defaults to the selected one. */) +If WINDOW is omitted or nil, it defaults to the selected window. */) (Lisp_Object window) { return decode_any_window (window)->frame; @@ -177,9 +178,8 @@ WINDOW can be any window and defaults to the selected one. */) DEFUN ("frame-root-window", Fframe_root_window, Sframe_root_window, 0, 1, 0, doc: /* Return the root window of FRAME-OR-WINDOW. If omitted, FRAME-OR-WINDOW defaults to the currently selected frame. -Else if FRAME-OR-WINDOW denotes any window, return the root window of -that window's frame. If FRAME-OR-WINDOW denotes a live frame, return -the root window of that frame. */) +With a frame argument, return that frame's root window. +With a window argument, return the root window of that window's frame. */) (Lisp_Object frame_or_window) { Lisp_Object window; @@ -198,9 +198,8 @@ the root window of that frame. */) } DEFUN ("minibuffer-window", Fminibuffer_window, Sminibuffer_window, 0, 1, 0, - doc: /* Return the window used now for minibuffers. -If the optional argument FRAME is specified, return the minibuffer window -used by that frame. */) + doc: /* Return the minibuffer window for frame FRAME. +If FRAME is omitted or nil, it defaults to the selected frame. */) (Lisp_Object frame) { if (NILP (frame)) @@ -212,7 +211,7 @@ used by that frame. */) DEFUN ("window-minibuffer-p", Fwindow_minibuffer_p, Swindow_minibuffer_p, 0, 1, 0, doc: /* Return non-nil if WINDOW is a minibuffer window. -WINDOW can be any window and defaults to the selected one. */) +If WINDOW is omitted or nil, it defaults to the selected window. */) (Lisp_Object window) { return MINI_WINDOW_P (decode_any_window (window)) ? Qt : Qnil; @@ -409,44 +408,48 @@ buffer of the selected window before each command. */) } DEFUN ("window-buffer", Fwindow_buffer, Swindow_buffer, 0, 1, 0, - doc: /* Return the buffer that WINDOW is displaying. -WINDOW can be any window and defaults to the selected one. -If WINDOW is an internal window return nil. */) + doc: /* Return the buffer displayed in window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. +Return nil for an internal window or a deleted window. */) (Lisp_Object window) { return decode_any_window (window)->buffer; } DEFUN ("window-parent", Fwindow_parent, Swindow_parent, 0, 1, 0, - doc: /* Return WINDOW's parent window. -WINDOW can be any window and defaults to the selected one. -Return nil if WINDOW has no parent. */) + doc: /* Return the parent window of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. +Return nil for a window with no parent (e.g. a root window). */) (Lisp_Object window) { return decode_any_window (window)->parent; } -DEFUN ("window-top-child", Fwindow_top_child, Swindow_top_child, 0, 1, 0, - doc: /* Return WINDOW's topmost child window. -WINDOW can be any window and defaults to the selected one. -Return nil if WINDOW is not a vertical combination. */) +DEFUN ("window-top-child", Fwindow_top_child, Swindow_top_child, 1, 1, 0, + doc: /* Return the topmost child window of window WINDOW. +Return nil if WINDOW is a live window (live windows have no children). +Return nil if WINDOW is an internal window whose children form a +horizontal combination. */) (Lisp_Object window) { + CHECK_WINDOW (window); return decode_any_window (window)->vchild; } -DEFUN ("window-left-child", Fwindow_left_child, Swindow_left_child, 0, 1, 0, - doc: /* Return WINDOW's leftmost child window. -WINDOW can be any window and defaults to the selected one. -Return nil if WINDOW is not a horizontal combination. */) +DEFUN ("window-left-child", Fwindow_left_child, Swindow_left_child, 1, 1, 0, + doc: /* Return the leftmost child window of window WINDOW. +Return nil if WINDOW is a live window (live windows have no children). +Return nil if WINDOW is an internal window whose children form a +vertical combination. */) (Lisp_Object window) { + CHECK_WINDOW (window); return decode_any_window (window)->hchild; } DEFUN ("window-next-sibling", Fwindow_next_sibling, Swindow_next_sibling, 0, 1, 0, - doc: /* Return WINDOW's next sibling window. -WINDOW can be any window and defaults to the selected one. + doc: /* Return the next sibling window of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. Return nil if WINDOW has no next sibling. */) (Lisp_Object window) { @@ -454,123 +457,96 @@ Return nil if WINDOW has no next sibling. */) } DEFUN ("window-prev-sibling", Fwindow_prev_sibling, Swindow_prev_sibling, 0, 1, 0, - doc: /* Return WINDOW's previous sibling window. -WINDOW can be any window and defaults to the selected one. + doc: /* Return the previous sibling window of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. Return nil if WINDOW has no previous sibling. */) (Lisp_Object window) { return decode_any_window (window)->prev; } -DEFUN ("window-splits", Fwindow_splits, Swindow_splits, 0, 1, 0, - doc: /* Return splits status for WINDOW. -WINDOW can be any window and defaults to the selected one. - -If the value returned by this function is nil and WINDOW is resized, the -corresponding space is preferably taken from (or given to) WINDOW's -right sibling. When WINDOW is deleted, its space is given to its left -sibling. +DEFUN ("window-combination-limit", Fwindow_combination_limit, Swindow_combination_limit, 0, 1, 0, + doc: /* Return combination limit of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. -If the value returned by this function is non-nil, resizing and deleting -WINDOW may resize all windows in the same combination. */) +If the return value is nil, child windows of WINDOW can be recombined with +WINDOW's siblings. A return value of t means that child windows of +WINDOW are never \(re-)combined with WINDOW's siblings. */) (Lisp_Object window) { - return decode_any_window (window)->splits; + return decode_any_window (window)->combination_limit; } -DEFUN ("set-window-splits", Fset_window_splits, Sset_window_splits, 2, 2, 0, - doc: /* Set splits status of WINDOW to STATUS. -WINDOW can be any window and defaults to the selected one. Return -STATUS. +DEFUN ("set-window-combination-limit", Fset_window_combination_limit, Sset_window_combination_limit, 2, 2, 0, + doc: /* Set combination limit of window WINDOW to STATUS; return STATUS. +If WINDOW is omitted or nil, it defaults to the selected window. -If STATUS is nil and WINDOW is later resized, the corresponding space is -preferably taken from (or given to) WINDOW's right sibling. When WINDOW -is deleted, its space is given to its left sibling. - -If STATUS is non-nil, resizing and deleting WINDOW may resize all -windows in the same combination. */) +If STATUS is nil, child windows of WINDOW can be recombined with +WINDOW's siblings. STATUS t means that child windows of WINDOW are +never \(re-)combined with WINDOW's siblings. Other values are reserved +for future use. */) (Lisp_Object window, Lisp_Object status) { register struct window *w = decode_any_window (window); - w->splits = status; + w->combination_limit = status; - return w->splits; + return w->combination_limit; } -DEFUN ("window-nest", Fwindow_nest, Swindow_nest, 0, 1, 0, - doc: /* Return nest status of WINDOW. -WINDOW can be any window and defaults to the selected one. - -If the return value is nil, subwindows of WINDOW can be recombined with -WINDOW's siblings. A return value of non-nil means that subwindows of -WINDOW are never \(re-)combined with WINDOW's siblings. */) +DEFUN ("window-use-time", Fwindow_use_time, Swindow_use_time, 0, 1, 0, + doc: /* Return the use time of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. +The window with the highest use time is the most recently selected +one. The window with the lowest use time is the least recently +selected one. */) (Lisp_Object window) { - return decode_any_window (window)->nest; + return decode_window (window)->use_time; } + +DEFUN ("window-total-height", Fwindow_total_height, Swindow_total_height, 0, 1, 0, + doc: /* Return the total height, in lines, of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. -DEFUN ("set-window-nest", Fset_window_nest, Sset_window_nest, 2, 2, 0, - doc: /* Set nest status of WINDOW to STATUS. -WINDOW can be any window and defaults to the selected one. Return -STATUS. +The return value includes the mode line and header line, if any. +If WINDOW is an internal window, the total height is the height +of the screen areas spanned by its children. -If STATUS is nil, subwindows of WINDOW can be recombined with WINDOW's -siblings. STATUS non-nil means that subwindows of WINDOW are never -\(re-)combined with WINDOW's siblings. */) - (Lisp_Object window, Lisp_Object status) +On a graphical display, this total height is reported as an +integer multiple of the default character height. */) + (Lisp_Object window) { - register struct window *w = decode_any_window (window); + return decode_any_window (window)->total_lines; +} - w->nest = status; +DEFUN ("window-total-width", Fwindow_total_width, Swindow_total_width, 0, 1, 0, + doc: /* Return the total width, in columns, of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. - return w->nest; -} +The return value includes any vertical dividers or scroll bars +belonging to WINDOW. If WINDOW is an internal window, the total width +is the width of the screen areas spanned by its children. -DEFUN ("window-use-time", Fwindow_use_time, Swindow_use_time, 0, 1, 0, - doc: /* Return WINDOW's use time. -WINDOW defaults to the selected window. The window with the highest use -time is the most recently selected one. The window with the lowest use -time is the least recently selected one. */) +On a graphical display, this total width is reported as an +integer multiple of the default character width. */) (Lisp_Object window) { - return decode_window (window)->use_time; -} - -DEFUN ("window-total-size", Fwindow_total_size, Swindow_total_size, 0, 2, 0, - doc: /* Return the total number of lines of WINDOW. -WINDOW can be any window and defaults to the selected one. The return -value includes WINDOW's mode line and header line, if any. If WINDOW -is internal, the return value is the sum of the total number of lines -of WINDOW's child windows if these are vertically combined and the -height of WINDOW's first child otherwise. - -Optional argument HORIZONTAL non-nil means return the total number of -columns of WINDOW. In this case the return value includes any vertical -dividers or scrollbars of WINDOW. If WINDOW is internal, the return -value is the sum of the total number of columns of WINDOW's child -windows if they are horizontally combined and the width of WINDOW's -first child otherwise. */) - (Lisp_Object window, Lisp_Object horizontal) -{ - if (NILP (horizontal)) - return decode_any_window (window)->total_lines; - else - return decode_any_window (window)->total_cols; + return decode_any_window (window)->total_cols; } DEFUN ("window-new-total", Fwindow_new_total, Swindow_new_total, 0, 1, 0, - doc: /* Return new total size of WINDOW. -WINDOW defaults to the selected window. */) + doc: /* Return the new total size of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. */) (Lisp_Object window) { return decode_any_window (window)->new_total; } DEFUN ("window-normal-size", Fwindow_normal_size, Swindow_normal_size, 0, 2, 0, - doc: /* Return normal height of WINDOW. -WINDOW can be any window and defaults to the selected one. Optional -argument HORIZONTAL non-nil means return normal width of WINDOW. */) + doc: /* Return the normal height of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. +If HORIZONTAL is non-nil, return the normal width of WINDOW. */) (Lisp_Object window, Lisp_Object horizontal) { if (NILP (horizontal)) @@ -580,24 +556,32 @@ argument HORIZONTAL non-nil means return normal width of WINDOW. */) } DEFUN ("window-new-normal", Fwindow_new_normal, Swindow_new_normal, 0, 1, 0, - doc: /* Return new normal size of WINDOW. -WINDOW can be any window and defaults to the selected one. */) + doc: /* Return new normal size of window WINDOW. +If WINDOW is omitted or nil, it defaults to the selected window. */) (Lisp_Object window) { return decode_any_window (window)->new_normal; } DEFUN ("window-left-column", Fwindow_left_column, Swindow_left_column, 0, 1, 0, - doc: /* Return left column of WINDOW. -WINDOW can be any window and defaults to the selected one. */) + doc: /* Return left column of window WINDOW. +This is the distance, in columns, between the left edge of WINDOW and +the left edge of the frame's window area. For instance, the return +value is 0 if there is no window to the left of WINDOW. + +If WINDOW is omitted or nil, it defaults to the selected window. */) (Lisp_Object window) { return decode_any_window (window)->left_col; } DEFUN ("window-top-line", Fwindow_top_line, Swindow_top_line, 0, 1, 0, - doc: /* Return top line of WINDOW. -WINDOW can be any window and defaults to the selected one. */) + doc: /* Return top line of window WINDOW. +This is the distance, in lines, between the top of WINDOW and the top +of the frame's window area. For instance, the return value is 0 if +there is no window above WINDOW. + +If WINDOW is omitted or nil, it defaults to the selected window. */) (Lisp_Object window) { return decode_any_window (window)->top_line; @@ -652,25 +636,34 @@ window_body_cols (struct window *w) return width; } -DEFUN ("window-body-size", Fwindow_body_size, Swindow_body_size, 0, 2, 0, - doc: /* Return the number of lines of WINDOW's body. -WINDOW must be a live window and defaults to the selected one. The -return value does not include WINDOW's mode line and header line, if -any. - -Optional argument HORIZONTAL non-nil means return the number of columns -of WINDOW's body. In this case, the return value does not include any -vertical dividers or scroll bars owned by WINDOW. On a window-system -the return value does not include the number of columns used for -WINDOW's fringes or display margins either. */) - (Lisp_Object window, Lisp_Object horizontal) +DEFUN ("window-body-height", Fwindow_body_height, Swindow_body_height, 0, 1, 0, + doc: /* Return the height, in lines, of WINDOW's text area. +If WINDOW is omitted or nil, it defaults to the selected window. +Signal an error if the window is not live. + +The returned height does not include the mode line or header line. +On a graphical display, the height is expressed as an integer multiple +of the default character height. If a line at the bottom of the text +area is only partially visible, that counts as a whole line; to +exclude partially-visible lines, use `window-text-height'. */) + (Lisp_Object window) { - struct window *w = decode_any_window (window); + struct window *w = decode_window (window); + return make_number (window_body_lines (w)); +} - if (NILP (horizontal)) - return make_number (window_body_lines (w)); - else - return make_number (window_body_cols (w)); +DEFUN ("window-body-width", Fwindow_body_width, Swindow_body_width, 0, 1, 0, + doc: /* Return the width, in columns, of WINDOW's text area. +If WINDOW is omitted or nil, it defaults to the selected window. +Signal an error if the window is not live. + +The return value does not include any vertical dividers, fringe or +marginal areas, or scroll bars. On a graphical display, the width is +expressed as an integer multiple of the default character width. */) + (Lisp_Object window) +{ + struct window *w = decode_window (window); + return make_number (window_body_cols (w)); } DEFUN ("window-hscroll", Fwindow_hscroll, Swindow_hscroll, 0, 1, 0, @@ -832,7 +825,7 @@ The inside edges do not include the space used by the WINDOW's scroll bar, display margins, fringes, header line, and/or mode line. */) (Lisp_Object window) { - register struct window *w = decode_any_window (window); + register struct window *w = decode_window (window); return list4 (make_number (WINDOW_BOX_LEFT_EDGE_COL (w) + WINDOW_LEFT_MARGIN_COLS (w) @@ -847,9 +840,9 @@ bar, display margins, fringes, header line, and/or mode line. */) } DEFUN ("window-inside-pixel-edges", Fwindow_inside_pixel_edges, Swindow_inside_pixel_edges, 0, 1, 0, - doc: /* Return a list of the edge pixel coordinates of WINDOW. -The list has the form (LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at -the top left corner of the frame. + doc: /* Return a list of the edge pixel coordinates of WINDOW's text area. +The list has the form (LEFT TOP RIGHT BOTTOM), all relative to (0,0) +at the top left corner of the frame's window area. RIGHT is one more than the rightmost x position of WINDOW's text area. BOTTOM is one more than the bottommost y position of WINDOW's text area. @@ -857,7 +850,7 @@ The inside edges do not include the space used by WINDOW's scroll bar, display margins, fringes, header line, and/or mode line. */) (Lisp_Object window) { - register struct window *w = decode_any_window (window); + register struct window *w = decode_window (window); return list4 (make_number (WINDOW_BOX_LEFT_EDGE_X (w) + WINDOW_LEFT_MARGIN_WIDTH (w) @@ -874,9 +867,9 @@ display margins, fringes, header line, and/or mode line. */) DEFUN ("window-inside-absolute-pixel-edges", Fwindow_inside_absolute_pixel_edges, Swindow_inside_absolute_pixel_edges, 0, 1, 0, - doc: /* Return a list of the edge pixel coordinates of WINDOW. -The list has the form (LEFT TOP RIGHT BOTTOM), all relative to 0, 0 at -the top left corner of the display. + doc: /* Return a list of the edge pixel coordinates of WINDOW's text area. +The list has the form (LEFT TOP RIGHT BOTTOM), all relative to (0,0) +at the top left corner of the frame's window area. RIGHT is one more than the rightmost x position of WINDOW's text area. BOTTOM is one more than the bottommost y position of WINDOW's text area. @@ -884,7 +877,7 @@ The inside edges do not include the space used by WINDOW's scroll bar, display margins, fringes, header line, and/or mode line. */) (Lisp_Object window) { - register struct window *w = decode_any_window (window); + register struct window *w = decode_window (window); int add_x, add_y; calc_absolute_offset (w, &add_x, &add_y); @@ -1888,7 +1881,7 @@ recombine_windows (Lisp_Object window) w = XWINDOW (window); parent = w->parent; - if (!NILP (parent) && NILP (w->nest)) + if (!NILP (parent) && NILP (w->combination_limit)) { p = XWINDOW (parent); if (((!NILP (p->vchild) && !NILP (w->vchild)) @@ -2303,7 +2296,7 @@ window_list_1 (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames) DEFUN ("window-list", Fwindow_list, Swindow_list, 0, 3, 0, doc: /* Return a list of windows on FRAME, starting with WINDOW. FRAME nil or omitted means use the selected frame. -WINDOW nil or omitted means use the selected window. +WINDOW nil or omitted means use the window selected within FRAME. MINIBUF t means include the minibuffer window, even if it isn't active. MINIBUF nil or omitted means include the minibuffer window only if it's active. @@ -2353,7 +2346,7 @@ Anything else means consider all windows on WINDOW's frame and no others. If WINDOW is not on the list of windows returned, some other window will -be listed first but no error is signalled. */) +be listed first but no error is signaled. */) (Lisp_Object window, Lisp_Object minibuf, Lisp_Object all_frames) { return window_list_1 (window, minibuf, all_frames); @@ -2560,9 +2553,9 @@ DEFUN ("delete-other-windows-internal", Fdelete_other_windows_internal, Only the frame WINDOW is on is affected. WINDOW may be any window and defaults to the selected one. -Optional argument ROOT, if non-nil, must specify an internal window -containing WINDOW as a subwindow. If this is the case, replace ROOT by -WINDOW and leave alone any windows not contained in ROOT. +Optional argument ROOT, if non-nil, must specify an internal window such +that WINDOW is in its window subtree. If this is the case, replace ROOT +by WINDOW and leave alone any windows not part of ROOT's subtree. When WINDOW is live try to reduce display jumps by keeping the text previously visible in WINDOW in the same place on the frame. Doing this @@ -2626,10 +2619,10 @@ window-start value is reasonable when this function is called. */) } else { - /* See if the frame's selected window is a subwindow of WINDOW, by - finding all the selected window's parents and comparing each - one with WINDOW. If it isn't we need a new selected window for - this frame. */ + /* See if the frame's selected window is a part of the window + subtree rooted at WINDOW, by finding all the selected window's + parents and comparing each one with WINDOW. If it isn't we + need a new selected window for this frame. */ swindow = FRAME_SELECTED_WINDOW (f); while (1) { @@ -2665,7 +2658,7 @@ window-start value is reasonable when this function is called. */) if (NILP (w->buffer)) { - /* Resize subwindows vertically. */ + /* Resize child windows vertically. */ XSETINT (delta, XINT (r->total_lines) - XINT (w->total_lines)); w->top_line = r->top_line; resize_root_window (window, delta, Qnil, Qnil); @@ -2680,7 +2673,7 @@ window-start value is reasonable when this function is called. */) resize_failed = 1; } - /* Resize subwindows horizontally. */ + /* Resize child windows horizontally. */ if (!resize_failed) { w->left_col = r->left_col; @@ -2729,23 +2722,20 @@ window-start value is reasonable when this function is called. */) XWINDOW (w->parent)->hchild = sibling; } - /* Delete ROOT and all subwindows of ROOT. */ + /* Delete ROOT and all child windows of ROOT. */ if (!NILP (r->vchild)) { - delete_all_subwindows (r->vchild); + delete_all_child_windows (r->vchild); r->vchild = Qnil; } else if (!NILP (r->hchild)) { - delete_all_subwindows (r->hchild); + delete_all_child_windows (r->hchild); r->hchild = Qnil; } replace_window (root, window, 1); - /* Reset WINDOW's splits status. */ - w->splits = Qnil; - /* This must become SWINDOW anyway ....... */ if (!NILP (w->buffer) && !resize_failed) { @@ -3260,8 +3250,7 @@ make_parent_window (Lisp_Object window, int horflag) p->start = Qnil; p->pointm = Qnil; p->buffer = Qnil; - p->splits = Qnil; - p->nest = Qnil; + p->combination_limit = Qnil; p->window_parameters = Qnil; } @@ -3308,7 +3297,7 @@ make_window (void) w->start_at_line_beg = w->display_table = w->dedicated = Qnil; w->base_line_number = w->base_line_pos = w->region_showing = Qnil; w->column_number_displayed = w->redisplay_end_trigger = Qnil; - w->splits = w->nest = w->window_parameters = Qnil; + w->combination_limit = w->window_parameters = Qnil; w->prev_buffers = w->next_buffers = Qnil; /* Initialize non-Lisp data. */ w->desired_matrix = w->current_matrix = 0; @@ -3338,7 +3327,7 @@ Return SIZE. Optional argument ADD non-nil means add SIZE to the new total size of WINDOW and return the sum. -Note: This function does not operate on any subwindows of WINDOW. */) +Note: This function does not operate on any child windows of WINDOW. */) (Lisp_Object window, Lisp_Object size, Lisp_Object add) { struct window *w = decode_any_window (window); @@ -3356,7 +3345,7 @@ DEFUN ("set-window-new-normal", Fset_window_new_normal, Sset_window_new_normal, doc: /* Set new normal size of WINDOW to SIZE. Return SIZE. -Note: This function does not operate on any subwindows of WINDOW. */) +Note: This function does not operate on any child windows of WINDOW. */) (Lisp_Object window, Lisp_Object size) { struct window *w = decode_any_window (window); @@ -3367,7 +3356,7 @@ Note: This function does not operate on any subwindows of WINDOW. */) /* Return 1 if setting w->total_lines (w->total_cols if HORFLAG is non-zero) to w->new_total would result in correct heights (widths) - for window W and recursively all subwindows of W. + for window W and recursively all child windows of W. Note: This function does not check any of `window-fixed-size-p', `window-min-height' or `window-min-width'. It does check that window @@ -3382,7 +3371,7 @@ window_resize_check (struct window *w, int horflag) { c = XWINDOW (w->vchild); if (horflag) - /* All subwindows of W must have the same width as W. */ + /* All child windows of W must have the same width as W. */ { while (c) { @@ -3394,8 +3383,8 @@ window_resize_check (struct window *w, int horflag) return 1; } else - /* The sum of the heights of the subwindows of W must equal W's - height. */ + /* The sum of the heights of the child windows of W must equal + W's height. */ { int sum_of_sizes = 0; while (c) @@ -3413,7 +3402,7 @@ window_resize_check (struct window *w, int horflag) { c = XWINDOW (w->hchild); if (horflag) - /* The sum of the widths of the subwindows of W must equal W's + /* The sum of the widths of the child windows of W must equal W's width. */ { int sum_of_sizes = 0; @@ -3427,7 +3416,7 @@ window_resize_check (struct window *w, int horflag) return (sum_of_sizes == XINT (w->new_total)); } else - /* All subwindows of W must have the same height as W. */ + /* All child windows of W must have the same height as W. */ { while (c) { @@ -3447,9 +3436,9 @@ window_resize_check (struct window *w, int horflag) } /* Set w->total_lines (w->total_cols if HORIZONTAL is non-zero) to - w->new_total for window W and recursively all subwindows of W. Also - calculate and assign the new vertical (horizontal) start positions of - each of these windows. + w->new_total for window W and recursively all child windows of W. + Also calculate and assign the new vertical (horizontal) start + positions of each of these windows. This function does not perform any error checks. Make sure you have run window_resize_check on W before applying this function. */ @@ -3523,8 +3512,8 @@ Optional argument HORIZONTAL omitted or nil means apply requested height values. HORIZONTAL non-nil means apply requested width values. This function checks whether the requested values sum up to a valid -window layout, recursively assigns the new sizes of all subwindows and -calculates and assigns the new start positions of these windows. +window layout, recursively assigns the new sizes of all child windows +and calculates and assigns the new start positions of these windows. Note: This function does not check any of `window-fixed-size-p', `window-min-height' or `window-min-width'. All these checks have to @@ -3681,7 +3670,7 @@ set correctly. See the code of `split-window' for how this is done. */) int horflag /* HORFLAG is 1 when we split side-by-side, 0 otherwise. */ = EQ (side, Qt) || EQ (side, Qleft) || EQ (side, Qright); - int do_nest = 0; + int combination_limit = 0; CHECK_WINDOW (old); o = XWINDOW (old); @@ -3690,11 +3679,11 @@ set correctly. See the code of `split-window' for how this is done. */) CHECK_NUMBER (total_size); - /* Set do_nest to 1 if we have to make a new parent window. We do - that if either `window-nest' is non-nil, or OLD has no parent, or - OLD is ortho-combined. */ - do_nest = - !NILP (Vwindow_nest) + /* Set combination_limit to 1 if we have to make a new parent window. + We do that if either `window-combination-limit' is t, or OLD has no + parent, or OLD is ortho-combined. */ + combination_limit = + !NILP (Vwindow_combination_limit) || NILP (o->parent) || NILP (horflag ? (XWINDOW (o->parent)->hchild) @@ -3714,8 +3703,8 @@ set correctly. See the code of `split-window' for how this is done. */) error ("Attempt to split minibuffer window"); else if (XINT (total_size) < (horflag ? 2 : 1)) error ("Size of new window too small (after split)"); - else if (!do_nest && !NILP (Vwindow_splits)) - /* `window-splits' non-nil means try to resize OLD's siblings + else if (!combination_limit && !NILP (Vwindow_combination_resize)) + /* `window-combination-resize' non-nil means try to resize OLD's siblings proportionally. */ { p = XWINDOW (o->parent); @@ -3739,7 +3728,7 @@ set correctly. See the code of `split-window' for how this is done. */) } /* This is our point of no return. */ - if (do_nest) + if (combination_limit) { /* Save the old value of o->normal_cols/lines. It gets corrupted by make_parent_window and we need it below for assigning it to @@ -3748,12 +3737,9 @@ set correctly. See the code of `split-window' for how this is done. */) make_parent_window (old, horflag); p = XWINDOW (o->parent); - /* Store value of `window-nest' in new parent's nest slot. */ - p->nest = Vwindow_nest; - /* Have PARENT inherit splits slot value from OLD. */ - p->splits = o->splits; - /* Store value of `window-splits' in OLD's splits slot. */ - o->splits = Vwindow_splits; + /* Store value of `window-combination-limit' in new parent's + combination_limit slot. */ + p->combination_limit = Vwindow_combination_limit; /* These get applied below. */ p->new_total = horflag ? o->total_cols : o->total_lines; p->new_normal = new_normal; @@ -3804,9 +3790,6 @@ set correctly. See the code of `split-window' for how this is done. */) n->scroll_bar_width = r->scroll_bar_width; n->vertical_scroll_bar_type = r->vertical_scroll_bar_type; - /* Store `window-splits' in NEW's splits slot. */ - n->splits = Vwindow_splits; - /* Directly assign orthogonal coordinates and sizes. */ if (horflag) { @@ -3920,12 +3903,12 @@ Signal an error when WINDOW is the only window on its frame. */) if (!NILP (w->vchild)) { - delete_all_subwindows (w->vchild); + delete_all_child_windows (w->vchild); w->vchild = Qnil; } else if (!NILP (w->hchild)) { - delete_all_subwindows (w->hchild); + delete_all_child_windows (w->hchild); w->hchild = Qnil; } else if (!NILP (w->buffer)) @@ -3943,10 +3926,9 @@ Signal an error when WINDOW is the only window on its frame. */) /* Put SIBLING into PARENT's place. */ replace_window (parent, sibling, 0); /* Have SIBLING inherit the following three slot values from - PARENT (the nest slot is not inherited). */ + PARENT (the combination_limit slot is not inherited). */ s->normal_cols = p->normal_cols; s->normal_lines = p->normal_lines; - s->splits = p->splits; /* Mark PARENT as deleted. */ p->vchild = p->hchild = Qnil; /* Try to merge SIBLING into its new parent. */ @@ -5208,10 +5190,10 @@ and redisplay normally--don't erase and redraw the frame. */) DEFUN ("window-text-height", Fwindow_text_height, Swindow_text_height, 0, 1, 0, doc: /* Return the height in lines of the text display area of WINDOW. -WINDOW defaults to the selected window. +If WINDOW is omitted or nil, it defaults to the selected window. -The return value does not include the mode line, any header line, nor -any partial-height lines in the text display area. */) +The returned height does not include the mode line, any header line, +nor any partial-height lines at the bottom of the text area. */) (Lisp_Object window) { struct window *w = decode_window (window); @@ -5334,7 +5316,7 @@ struct saved_window Lisp_Object left_margin_cols, right_margin_cols; Lisp_Object left_fringe_width, right_fringe_width, fringes_outside_margins; Lisp_Object scroll_bar_width, vertical_scroll_bar_type, dedicated; - Lisp_Object splits, nest, window_parameters; + Lisp_Object combination_limit, window_parameters; }; #define SAVED_WINDOW_N(swv,n) \ @@ -5505,7 +5487,7 @@ the return value is nil. Otherwise the value is t. */) Save their current buffers in their height fields, since we may need it later, if a buffer saved in the configuration is now dead. */ - delete_all_subwindows (FRAME_ROOT_WINDOW (f)); + delete_all_child_windows (FRAME_ROOT_WINDOW (f)); for (k = 0; k < saved_windows->header.size; k++) { @@ -5565,8 +5547,7 @@ the return value is nil. Otherwise the value is t. */) w->scroll_bar_width = p->scroll_bar_width; w->vertical_scroll_bar_type = p->vertical_scroll_bar_type; w->dedicated = p->dedicated; - w->splits = p->splits; - w->nest = p->nest; + w->combination_limit = p->combination_limit; w->window_parameters = p->window_parameters; XSETFASTINT (w->last_modified, 0); XSETFASTINT (w->last_overlay_modified, 0); @@ -5719,10 +5700,10 @@ the return value is nil. Otherwise the value is t. */) } -/* Delete all subwindows reachable via the next, vchild, and hchild - slots of WINDOW. */ +/* Recursively delete all child windows reachable via the next, vchild, + and hchild slots of WINDOW. */ void -delete_all_subwindows (Lisp_Object window) +delete_all_child_windows (Lisp_Object window) { register struct window *w; @@ -5730,18 +5711,18 @@ delete_all_subwindows (Lisp_Object window) if (!NILP (w->next)) /* Delete WINDOW's siblings (we traverse postorderly). */ - delete_all_subwindows (w->next); + delete_all_child_windows (w->next); w->total_lines = w->buffer; /* See Fset_window_configuration for excuse. */ if (!NILP (w->vchild)) { - delete_all_subwindows (w->vchild); + delete_all_child_windows (w->vchild); w->vchild = Qnil; } else if (!NILP (w->hchild)) { - delete_all_subwindows (w->hchild); + delete_all_child_windows (w->hchild); w->hchild = Qnil; } else if (!NILP (w->buffer)) @@ -5844,8 +5825,7 @@ save_window_save (Lisp_Object window, struct Lisp_Vector *vector, int i) p->scroll_bar_width = w->scroll_bar_width; p->vertical_scroll_bar_type = w->vertical_scroll_bar_type; p->dedicated = w->dedicated; - p->splits = w->splits; - p->nest = w->nest; + p->combination_limit = w->combination_limit; p->window_parameters = w->window_parameters; if (!NILP (w->buffer)) { @@ -5995,7 +5975,7 @@ means no margin. */) DEFUN ("window-margins", Fwindow_margins, Swindow_margins, 0, 1, 0, doc: /* Get width of marginal areas of window WINDOW. -If WINDOW is omitted or nil, use the currently selected window. +If WINDOW is omitted or nil, it defaults to the selected window. Value is a cons of the form (LEFT-WIDTH . RIGHT-WIDTH). If a marginal area does not exist, its width will be returned as nil. */) @@ -6059,7 +6039,7 @@ display marginal areas and the text area. */) DEFUN ("window-fringes", Fwindow_fringes, Swindow_fringes, 0, 1, 0, doc: /* Get width of fringes of window WINDOW. -If WINDOW is omitted or nil, use the currently selected window. +If WINDOW is omitted or nil, it defaults to the selected window. Value is a list of the form (LEFT-WIDTH RIGHT-WIDTH OUTSIDE-MARGINS). */) (Lisp_Object window) { @@ -6128,7 +6108,7 @@ Fourth parameter HORIZONTAL-TYPE is currently unused. */) DEFUN ("window-scroll-bars", Fwindow_scroll_bars, Swindow_scroll_bars, 0, 1, 0, doc: /* Get width and type of scroll bars of window WINDOW. -If WINDOW is omitted or nil, use the currently selected window. +If WINDOW is omitted or nil, it defaults to the selected window. Value is a list of the form (WIDTH COLS VERTICAL-TYPE HORIZONTAL-TYPE). If WIDTH is nil or TYPE is t, the window is using the frame's corresponding value. */) @@ -6151,7 +6131,7 @@ value. */) DEFUN ("window-vscroll", Fwindow_vscroll, Swindow_vscroll, 0, 2, 0, doc: /* Return the amount by which WINDOW is scrolled vertically. -Use the selected window if WINDOW is nil or omitted. +If WINDOW is omitted or nil, it defaults to the selected window. Normally, value is a multiple of the canonical character height of WINDOW; optional second arg PIXELS-P means value is measured in pixels. */) (Lisp_Object window, Lisp_Object pixels_p) @@ -6308,7 +6288,8 @@ freeze_window_starts (struct frame *f, int freeze_p) and the like. This ignores a couple of things like the dedicatedness status of - window, splits, nest and the like. This might have to be fixed. */ + window, combination_limit and the like. This might have to be + fixed. */ int compare_window_configurations (Lisp_Object configuration1, Lisp_Object configuration2, int ignore_positions) @@ -6512,41 +6493,39 @@ will redraw the entire frame; the special value `tty' causes the frame to be redrawn only if it is a tty frame. */); Vrecenter_redisplay = Qtty; - DEFVAR_LISP ("window-splits", Vwindow_splits, - doc: /* Non-nil means splitting windows is handled specially. + DEFVAR_LISP ("window-combination-resize", Vwindow_combination_resize, + doc: /* Non-nil means resize window combinations proportionally. If this variable is nil, splitting a window gets the entire screen space -for displaying the new window from the window to split. If this -variable is non-nil, splitting a window may resize all windows in the -same combination. This also allows to split a window that is otherwise -too small or of fixed size. - -The value of this variable is also assigned to the split status of the -new window and, provided the old and new window form a new combination, -to the window that was split as well. The split status of a window can -be retrieved with the function `window-splits' and altered by the -function `set-window-splits'. - -If the value of the variable `window-nest' is non-nil, the space for the -new window is exclusively taken from the window that shall be split, but -the split status of the window that is split as well as that of the new -window are still set to the value of this variable. */); - Vwindow_splits = Qnil; - - DEFVAR_LISP ("window-nest", Vwindow_nest, +for displaying the new window from the window to split. Deleting and +resizing a window preferably resizes one adjacent window only. + +If this variable is non-nil, splitting a window tries to get the space +proportionally from all windows in the same combination. This also +allows to split a window that is otherwise too small or of fixed size. +Resizing and deleting a window proportionally resize all windows in the +same combination. + +This variable takes no effect if `window-combination-limit' is non-nil. */); + Vwindow_combination_resize = Qnil; + + DEFVAR_LISP ("window-combination-limit", Vwindow_combination_limit, doc: /* Non-nil means splitting a window makes a new parent window. If this variable is nil, splitting a window will create a new parent window only if the window has no parent window or the window shall -become a combination orthogonal to the one it it is part of. +become a combination orthogonal to the one it is part of. + +If this variable is t, splitting a window always creates a new parent +window. If all splits behave this way, each frame's window tree is a +binary tree and every window but the frame's root window has exactly one +sibling. -If this variable is non-nil, splitting a window always creates a new -parent window. If all splits behave this way, each frame's window tree -is a binary tree and every window but the frame's root window has -exactly one sibling. +Other values are reserved for future use. -The value of this variable is also assigned to the nest status of the -new parent window. The nest status of a window can be retrieved via the -function `window-nest' and altered by the function `set-window-nest'. */); - Vwindow_nest = Qnil; +The value of this variable is also assigned to the combination-limit +status of the new parent window. The combination-limit status of a +window can be retrieved via the function `window-combination-limit' and +altered by the function `set-window-combination-limit'. */); + Vwindow_combination_limit = Qnil; defsubr (&Sselected_window); defsubr (&Sminibuffer_window); @@ -6566,21 +6545,21 @@ function `window-nest' and altered by the function `set-window-nest'. */); defsubr (&Swindow_left_child); defsubr (&Swindow_next_sibling); defsubr (&Swindow_prev_sibling); - defsubr (&Swindow_splits); - defsubr (&Sset_window_splits); - defsubr (&Swindow_nest); - defsubr (&Sset_window_nest); + defsubr (&Swindow_combination_limit); + defsubr (&Sset_window_combination_limit); defsubr (&Swindow_use_time); defsubr (&Swindow_top_line); defsubr (&Swindow_left_column); - defsubr (&Swindow_total_size); + defsubr (&Swindow_total_height); + defsubr (&Swindow_total_width); defsubr (&Swindow_normal_size); defsubr (&Swindow_new_total); defsubr (&Swindow_new_normal); defsubr (&Sset_window_new_total); defsubr (&Sset_window_new_normal); defsubr (&Swindow_resize_apply); - defsubr (&Swindow_body_size); + defsubr (&Swindow_body_height); + defsubr (&Swindow_body_width); defsubr (&Swindow_hscroll); defsubr (&Sset_window_hscroll); defsubr (&Swindow_redisplay_end_trigger); diff --git a/src/window.h b/src/window.h index c6fa5e7a338..de0f7307a51 100644 --- a/src/window.h +++ b/src/window.h @@ -258,13 +258,8 @@ struct window must run the redisplay-end-trigger-hook. */ Lisp_Object redisplay_end_trigger; - /* Non-nil means deleting or resizing this window distributes - space among all windows in the same combination. */ - Lisp_Object splits; - - /* Non-nil means this window's child windows are never - (re-)combined. */ - Lisp_Object nest; + /* t means this window's child windows are not (re-)combined. */ + Lisp_Object combination_limit; /* Alist of <buffer, window-start, window-point> triples listing buffers previously shown in this window. */ @@ -824,7 +819,7 @@ extern Lisp_Object window_from_coordinates (struct frame *, int, int, enum window_part *, int); EXFUN (Fwindow_dedicated_p, 1); extern void resize_frame_windows (struct frame *, int, int); -extern void delete_all_subwindows (Lisp_Object); +extern void delete_all_child_windows (Lisp_Object); extern void freeze_window_starts (struct frame *, int); extern void grow_mini_window (struct window *, int); extern void shrink_mini_window (struct window *); diff --git a/src/xdisp.c b/src/xdisp.c index 698f217f240..3883a753940 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -954,7 +954,7 @@ static int coords_in_mouse_face_p (struct window *, int, int); This is the height of W minus the height of a mode line, if any. */ -inline int +int window_text_bottom_y (struct window *w) { int height = WINDOW_TOTAL_HEIGHT (w); @@ -968,7 +968,7 @@ window_text_bottom_y (struct window *w) means return the total width of W, not including fringes to the left and right of the window. */ -inline int +int window_box_width (struct window *w, int area) { int cols = XFASTINT (w->total_cols); @@ -1007,7 +1007,7 @@ window_box_width (struct window *w, int area) /* Return the pixel height of the display area of window W, not including mode lines of W, if any. */ -inline int +int window_box_height (struct window *w) { struct frame *f = XFRAME (w->frame); @@ -1054,7 +1054,7 @@ window_box_height (struct window *w) area AREA of window W. AREA < 0 means return the left edge of the whole window, to the right of the left fringe of W. */ -inline int +int window_box_left_offset (struct window *w, int area) { int x; @@ -1086,7 +1086,7 @@ window_box_left_offset (struct window *w, int area) area AREA of window W. AREA < 0 means return the right edge of the whole window, to the left of the right fringe of W. */ -inline int +int window_box_right_offset (struct window *w, int area) { return window_box_left_offset (w, area) + window_box_width (w, area); @@ -1096,7 +1096,7 @@ window_box_right_offset (struct window *w, int area) area AREA of window W. AREA < 0 means return the left edge of the whole window, to the right of the left fringe of W. */ -inline int +int window_box_left (struct window *w, int area) { struct frame *f = XFRAME (w->frame); @@ -1116,7 +1116,7 @@ window_box_left (struct window *w, int area) area AREA of window W. AREA < 0 means return the right edge of the whole window, to the left of the right fringe of W. */ -inline int +int window_box_right (struct window *w, int area) { return window_box_left (w, area) + window_box_width (w, area); @@ -1129,7 +1129,7 @@ window_box_right (struct window *w, int area) coordinates of the upper-left corner of the box. Return in *BOX_WIDTH, and *BOX_HEIGHT the pixel width and height of the box. */ -inline void +void window_box (struct window *w, int area, int *box_x, int *box_y, int *box_width, int *box_height) { @@ -2766,9 +2766,13 @@ init_iterator (struct it *it, struct window *w, /* Do we need to reorder bidirectional text? Not if this is a unibyte buffer: by definition, none of the single-byte characters are strong R2L, so no reordering is needed. And - bidi.c doesn't support unibyte buffers anyway. */ + bidi.c doesn't support unibyte buffers anyway. Also, don't + reorder while we are loading loadup.el, since the tables of + character properties needed for reordering are not yet + available. */ it->bidi_p = - !NILP (BVAR (current_buffer, bidi_display_reordering)) + NILP (Vpurify_flag) + && !NILP (BVAR (current_buffer, bidi_display_reordering)) && it->multibyte_p; /* If we are to reorder bidirectional text, init the bidi @@ -6144,8 +6148,12 @@ reseat_to_string (struct it *it, const char *s, Lisp_Object string, it->multibyte_p = multibyte > 0; /* Bidirectional reordering of strings is controlled by the default - value of bidi-display-reordering. */ - it->bidi_p = !NILP (BVAR (&buffer_defaults, bidi_display_reordering)); + value of bidi-display-reordering. Don't try to reorder while + loading loadup.el, as the necessary character property tables are + not yet available. */ + it->bidi_p = + NILP (Vpurify_flag) + && !NILP (BVAR (&buffer_defaults, bidi_display_reordering)); if (s == NULL) { @@ -17948,6 +17956,26 @@ insert_left_trunc_glyphs (struct it *it) } } +/* Compute the hash code for ROW. */ +#if !XASSERTS +static +#endif +unsigned +row_hash (struct glyph_row *row) +{ + int area, k; + unsigned hashval = 0; + + for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) + for (k = 0; k < row->used[area]; ++k) + hashval = ((((hashval << 4) + (hashval >> 24)) & 0x0fffffff) + + row->glyphs[area][k].u.val + + row->glyphs[area][k].face_id + + row->glyphs[area][k].padding_p + + (row->glyphs[area][k].type << 2)); + + return hashval; +} /* Compute the pixel height and width of IT->glyph_row. @@ -18034,17 +18062,7 @@ compute_line_metrics (struct it *it) } /* Compute a hash code for this row. */ - { - int area, i; - row->hash = 0; - for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) - for (i = 0; i < row->used[area]; ++i) - row->hash = ((((row->hash << 4) + (row->hash >> 24)) & 0x0fffffff) - + row->glyphs[area][i].u.val - + row->glyphs[area][i].face_id - + row->glyphs[area][i].padding_p - + (row->glyphs[area][i].type << 2)); - } + row->hash = row_hash (row); it->max_ascent = it->max_descent = 0; it->max_phys_ascent = it->max_phys_descent = 0; @@ -19381,9 +19399,18 @@ display_line (struct it *it) overlay_arrow_seen = 1; } + /* Highlight trailing whitespace. */ + if (!NILP (Vshow_trailing_whitespace)) + highlight_trailing_whitespace (it->f, it->glyph_row); + /* Compute pixel dimensions of this line. */ compute_line_metrics (it); + /* Implementation note: No changes in the glyphs of ROW or in their + faces can be done past this point, because compute_line_metrics + computes ROW's hash value and stores it within the glyph_row + structure. */ + /* Record whether this row ends inside an ellipsis. */ row->ends_in_ellipsis_p = (it->method == GET_FROM_DISPLAY_VECTOR @@ -19418,10 +19445,6 @@ display_line (struct it *it) && cursor_row_p (row)) set_cursor_from_row (it->w, row, it->w->desired_matrix, 0, 0, 0, 0); - /* Highlight trailing whitespace. */ - if (!NILP (Vshow_trailing_whitespace)) - highlight_trailing_whitespace (it->f, it->glyph_row); - /* Prepare for the next line. This line starts horizontally at (X HPOS) = (0 0). Vertical positions are incremented. As a convenience for the caller, IT->glyph_row is set to the next @@ -19467,7 +19490,10 @@ See also `bidi-paragraph-direction'. */) } if (NILP (BVAR (buf, bidi_display_reordering)) - || NILP (BVAR (buf, enable_multibyte_characters))) + || NILP (BVAR (buf, enable_multibyte_characters)) + /* When we are loading loadup.el, the character property tables + needed for bidi iteration are not yet available. */ + || !NILP (Vpurify_flag)) return Qleft_to_right; else if (!NILP (BVAR (buf, bidi_paragraph_direction))) return BVAR (buf, bidi_paragraph_direction); @@ -22045,7 +22071,7 @@ get_glyph_face_and_encoding (struct frame *f, struct glyph *glyph, /* Get glyph code of character C in FONT in the two-byte form CHAR2B. - Retunr 1 if FONT has a glyph for C, otherwise return 0. */ + Return 1 if FONT has a glyph for C, otherwise return 0. */ static inline int get_char_glyph_code (int c, struct font *font, XChar2b *char2b) @@ -22117,6 +22143,12 @@ fill_composite_glyph_string (struct glyph_string *s, struct face *base_face, } s->cmp_to = i; + if (s->face == NULL) + { + s->face = base_face->ascii_face; + s->font = s->face->font; + } + /* All glyph strings for the same composition has the same width, i.e. the width set for the first component of the composition. */ s->width = s->first_glyph->pixel_width; @@ -23612,7 +23644,7 @@ produce_stretch_glyph (struct it *it) { width = it->last_visible_x - it->current_x; #ifdef HAVE_WINDOW_SYSTEM - /* Subtact one more pixel from the stretch width, but only on + /* Subtract one more pixel from the stretch width, but only on GUI frames, since on a TTY each glyph is one "pixel" wide. */ width -= FRAME_WINDOW_P (it->f); #endif @@ -26899,7 +26931,7 @@ note_mouse_highlight (struct frame *f, int x, int y) && XFASTINT (w->last_modified) == BUF_MODIFF (b) && XFASTINT (w->last_overlay_modified) == BUF_OVERLAY_MODIFF (b)) { - int hpos, vpos, dx, dy, area; + int hpos, vpos, dx, dy, area = LAST_AREA; ptrdiff_t pos; struct glyph *glyph; Lisp_Object object; @@ -27159,8 +27191,12 @@ note_mouse_highlight (struct frame *f, int x, int y) } mouse_face_from_buffer_pos (window, hlinfo, pos, - XFASTINT (before), - XFASTINT (after), + NILP (before) + ? 1 + : XFASTINT (before), + NILP (after) + ? BUF_Z (XBUFFER (buffer)) + : XFASTINT (after), before_string, after_string, disp_string); cursor = No_Cursor; @@ -27960,7 +27996,6 @@ syms_of_xdisp (void) DEFSYM (Qhollow, "hollow"); DEFSYM (Qhand, "hand"); DEFSYM (Qarrow, "arrow"); - DEFSYM (Qtext, "text"); DEFSYM (Qinhibit_free_realized_faces, "inhibit-free-realized-faces"); list_of_error = Fcons (Fcons (intern_c_string ("error"), @@ -28429,7 +28464,7 @@ To add a prefix to continuation lines, use `wrap-prefix'. */); DEFVAR_INT ("overline-margin", overline_margin, doc: /* *Space between overline and text, in pixels. The default value is 2: the height of the overline (1 pixel) plus 1 pixel -margin to the caracter height. */); +margin to the character height. */); overline_margin = 2; DEFVAR_INT ("underline-minimum-offset", diff --git a/src/xfaces.c b/src/xfaces.c index ee41ab69b0b..2dc46b2fa02 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -27,7 +27,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ 1. Font family name. - 2. Font foundary name. + 2. Font foundry name. 3. Relative proportionate width, aka character set width or set width (swidth), e.g. `semi-compressed'. @@ -4193,12 +4193,12 @@ prepare_face_for_display (struct frame *f, struct face *face) static int color_distance (XColor *x, XColor *y) { - /* This formula is from a paper title `Colour metric' by Thiadmer Riemersma. + /* This formula is from a paper titled `Colour metric' by Thiadmer Riemersma. Quoting from that paper: This formula has results that are very close to L*u*v* (with the modified lightness curve) and, more importantly, it is a more even - algorithm: it does not have a range of colours where it suddenly + algorithm: it does not have a range of colors where it suddenly gives far from optimal results. See <http://www.compuphase.com/cmetric.htm> for more info. */ diff --git a/src/xfns.c b/src/xfns.c index ba73bdba70b..88c70a9b410 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -2914,7 +2914,7 @@ x_free_gcs (struct frame *f) /* Handler for signals raised during x_create_frame and - x_create_top_frame. FRAME is the frame which is partially + x_create_tip_frame. FRAME is the frame which is partially constructed. */ static Lisp_Object @@ -2929,13 +2929,14 @@ unwind_create_frame (Lisp_Object frame) return Qnil; /* If frame is ``official'', nothing to do. */ - if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame)) + if (NILP (Fmemq (frame, Vframe_list))) { #if GLYPH_DEBUG && XASSERTS struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); #endif x_free_frame_resources (f); + free_glyphs (f); #if GLYPH_DEBUG /* Check that reference counts are indeed correct. */ @@ -3137,7 +3138,6 @@ This function is an internal primitive--use `make-frame' instead. */) FRAME_CAN_HAVE_SCROLL_BARS (f) = 1; f->terminal = dpyinfo->terminal; - f->terminal->reference_count++; f->output_method = output_x_window; f->output_data.x = (struct x_output *) xmalloc (sizeof (struct x_output)); @@ -3307,6 +3307,12 @@ This function is an internal primitive--use `make-frame' instead. */) "scrollBarBackground", "ScrollBarBackground", 0); +#if GLYPH_DEBUG + image_cache_refcount = + FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; + dpyinfo_refcount = dpyinfo->reference_count; +#endif /* GLYPH_DEBUG */ + /* Init faces before x_default_parameter is called for scroll-bar parameters because that function calls x_set_scroll_bar_width, which calls change_frame_size, which calls Fset_window_buffer, @@ -3315,11 +3321,6 @@ This function is an internal primitive--use `make-frame' instead. */) happen. */ init_frame_faces (f); -#if GLYPH_DEBUG - image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount; - dpyinfo_refcount = dpyinfo->reference_count; -#endif /* GLYPH_DEBUG */ - /* The X resources controlling the menu-bar and tool-bar are processed specially at startup, and reflected in the mode variables; ignore them here. */ @@ -3363,6 +3364,7 @@ This function is an internal primitive--use `make-frame' instead. */) x_make_gc (f); /* Now consider the frame official. */ + f->terminal->reference_count++; FRAME_X_DISPLAY_INFO (f)->reference_count++; Vframe_list = Fcons (frame, Vframe_list); @@ -3689,7 +3691,7 @@ If omitted or nil, that stands for the selected frame's display. */) DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, doc: /* Return the "vendor ID" string of the X server of display TERMINAL. -\(Labelling every distributor as a "vendor" embodies the false assumption +\(Labeling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) The optional argument TERMINAL specifies which display to ask about. TERMINAL should be a terminal object, a frame or a display name (a string). @@ -4593,7 +4595,6 @@ x_create_tip_frame (struct x_display_info *dpyinfo, record_unwind_protect (unwind_create_tip_frame, frame); f->terminal = dpyinfo->terminal; - f->terminal->reference_count++; /* By setting the output method, we're essentially saying that the frame is live, as per FRAME_LIVE_P. If we get a signal @@ -4715,6 +4716,12 @@ x_create_tip_frame (struct x_display_info *dpyinfo, x_default_parameter (f, parms, Qborder_color, build_string ("black"), "borderColor", "BorderColor", RES_TYPE_STRING); +#if GLYPH_DEBUG + image_cache_refcount = + FRAME_IMAGE_CACHE (f) ? FRAME_IMAGE_CACHE (f)->refcount : 0; + dpyinfo_refcount = dpyinfo->reference_count; +#endif /* GLYPH_DEBUG */ + /* Init faces before x_default_parameter is called for scroll-bar parameters because that function calls x_set_scroll_bar_width, which calls change_frame_size, which calls Fset_window_buffer, @@ -4723,11 +4730,6 @@ x_create_tip_frame (struct x_display_info *dpyinfo, happen. */ init_frame_faces (f); -#if GLYPH_DEBUG - image_cache_refcount = FRAME_IMAGE_CACHE (f)->refcount; - dpyinfo_refcount = dpyinfo->reference_count; -#endif /* GLYPH_DEBUG */ - f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window; x_figure_window_size (f, parms, 0); @@ -4833,14 +4835,16 @@ x_create_tip_frame (struct x_display_info *dpyinfo, UNGCPRO; + /* Now that the frame will be official, it counts as a reference to + its display and terminal. */ + FRAME_X_DISPLAY_INFO (f)->reference_count++; + f->terminal->reference_count++; + /* It is now ok to make the frame official even if we get an error below. And the frame needs to be on Vframe_list or making it visible won't work. */ Vframe_list = Fcons (frame, Vframe_list); - /* Now that the frame is official, it counts as a reference to - its display. */ - FRAME_X_DISPLAY_INFO (f)->reference_count++; /* Setting attributes of faces of the tooltip frame from resources and similar will increment face_change_count, which leads to the diff --git a/src/xfont.c b/src/xfont.c index 8b1e37aa146..73f1e130be0 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -272,8 +272,8 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont, return 0; } -/* A hash table recoding which font supports which scritps. Each key - is a vector of characteristic font propertis FOUNDRY to WIDTH and +/* A hash table recoding which font supports which scripts. Each key + is a vector of characteristic font properties FOUNDRY to WIDTH and ADDSTYLE, and each value is a list of script symbols. We assume that fonts that have the same value in the above @@ -281,7 +281,7 @@ xfont_chars_supported (Lisp_Object chars, XFontStruct *xfont, static Lisp_Object xfont_scripts_cache; -/* Re-usable vector to store characteristic font properites. */ +/* Re-usable vector to store characteristic font properties. */ static Lisp_Object xfont_scratch_props; /* Return a list of scripts supported by the font of FONTNAME whose diff --git a/src/xmenu.c b/src/xmenu.c index eab25d709f6..d73051be6de 100644 --- a/src/xmenu.c +++ b/src/xmenu.c @@ -1604,6 +1604,17 @@ create_and_show_popup_menu (FRAME_PTR f, widget_value *first_wv, #endif /* not USE_GTK */ +static Lisp_Object +cleanup_widget_value_tree (Lisp_Object arg) +{ + struct Lisp_Save_Value *p = XSAVE_VALUE (arg); + widget_value *wv = p->pointer; + + free_menubar_widget_value_tree (wv); + + return Qnil; +} + Lisp_Object xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, Lisp_Object title, const char **error_name, Time timestamp) @@ -1618,6 +1629,8 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, int first_pane; + ptrdiff_t specpdl_count = SPECPDL_INDEX (); + if (! FRAME_X_P (f)) abort (); @@ -1812,11 +1825,15 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps, /* No selection has been chosen yet. */ menu_item_selection = 0; + /* Make sure to free the widget_value objects we used to specify the + contents even with longjmp. */ + record_unwind_protect (cleanup_widget_value_tree, + make_save_value (first_wv, 0)); + /* Actually create and show the menu until popped down. */ create_and_show_popup_menu (f, first_wv, x, y, for_click, timestamp); - /* Free the widget_value objects we used to specify the contents. */ - free_menubar_widget_value_tree (first_wv); + unbind_to (specpdl_count, Qnil); /* Find the selected item, and its pane, to return the proper value. */ @@ -2003,6 +2020,8 @@ xdialog_show (FRAME_PTR f, /* 1 means we've seen the boundary between left-hand elts and right-hand. */ int boundary_seen = 0; + ptrdiff_t specpdl_count = SPECPDL_INDEX (); + if (! FRAME_X_P (f)) abort (); @@ -2116,11 +2135,15 @@ xdialog_show (FRAME_PTR f, /* No selection has been chosen yet. */ menu_item_selection = 0; + /* Make sure to free the widget_value objects we used to specify the + contents even with longjmp. */ + record_unwind_protect (cleanup_widget_value_tree, + make_save_value (first_wv, 0)); + /* Actually create and show the dialog. */ create_and_show_dialog (f, first_wv); - /* Free the widget_value objects we used to specify the contents. */ - free_menubar_widget_value_tree (first_wv); + unbind_to (specpdl_count, Qnil); /* Find the selected item, and its pane, to return the proper value. */ diff --git a/src/xselect.c b/src/xselect.c index 9eee4ee9593..d2ab416176c 100644 --- a/src/xselect.c +++ b/src/xselect.c @@ -2354,7 +2354,7 @@ x_fill_property_data (Display *dpy, Lisp_Object data, void *ret, int format) F is the frame to be used to look up X atoms if the TYPE is XA_ATOM. DATA is a C array of values to be converted. TYPE is the type of the data. Only XA_ATOM is special, it converts - each number in DATA to its corresponfing X atom as a symbol. + each number in DATA to its corresponding X atom as a symbol. FORMAT is 8, 16 or 32 and gives the size in bits for each C value to be stored in RET. SIZE is the number of elements in DATA. diff --git a/src/xsettings.c b/src/xsettings.c index d57f3b5be81..a8604ac5897 100644 --- a/src/xsettings.c +++ b/src/xsettings.c @@ -121,7 +121,7 @@ store_font_name_changed (const char *newfont) } #endif /* HAVE_XFT */ -/* Map TOOL_BAR_STYLE from a string to its correspinding Lisp value. +/* Map TOOL_BAR_STYLE from a string to its corresponding Lisp value. Return Qnil if TOOL_BAR_STYLE is not known. */ static Lisp_Object diff --git a/src/xsmfns.c b/src/xsmfns.c index 55daec73307..7deac7b14e4 100644 --- a/src/xsmfns.c +++ b/src/xsmfns.c @@ -462,7 +462,7 @@ x_session_initialize (struct x_display_info *dpyinfo) Vx_session_id = build_string (client_id); #ifdef USE_GTK - /* GTK creats a leader window by itself, but we need to tell + /* GTK creates a leader window by itself, but we need to tell it about our client_id. */ gdk_x11_set_sm_client_id (client_id); #else diff --git a/src/xterm.c b/src/xterm.c index 9603c41fce2..d5131c9a60c 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -6119,7 +6119,7 @@ handle_one_xevent (struct x_display_info *dpyinfo, XEvent *eventptr, { /* Gnome shell does not iconify us when C-z is pressed. It hides the frame. So if our state says we aren't hidden anymore, - treat is as deiconfied. */ + treat it as deiconified. */ if (! f->async_iconified) SET_FRAME_GARBAGED (f); f->async_visible = 1; diff --git a/src/xterm.h b/src/xterm.h index af2e94ed112..92761ccee87 100644 --- a/src/xterm.h +++ b/src/xterm.h @@ -330,7 +330,7 @@ struct x_display_info ptrdiff_t x_dnd_atoms_length; /* Extended window manager hints, Atoms supported by the window manager and - atoms for settig the window type. */ + atoms for setting the window type. */ Atom Xatom_net_supported, Xatom_net_supporting_wm_check; Atom *net_supported_atoms; int nr_net_supported_atoms; diff --git a/test/ChangeLog b/test/ChangeLog index de4fb270440..9afed6f5f90 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,9 @@ +2011-11-16 Juanma Barranquero <lekktu@gmail.com> + + * automated/icalendar-tests.el (icalendar-tests--get-ical-event) + (icalendar-tests--test-export, icalendar-tests--do-test-export): + * cedet/srecode-tests.el (srecode-field-utest-impl): Fix typo. + 2011-10-30 Ulf Jasper <ulf.jasper@web.de> * automated/newsticker-tests.el diff --git a/test/automated/compile-tests.el b/test/automated/compile-tests.el index 1d9a266904c..419cc0e9116 100644 --- a/test/automated/compile-tests.el +++ b/test/automated/compile-tests.el @@ -71,7 +71,7 @@ ;; caml ("File \"foobar.ml\", lines 5-8, characters 20-155: blah blah" 1 (19 . 155) (5 . 8) "foobar.ml") - ("File \"F:\\ocaml\\sorting.ml\", line 65, characters 2-145:" + ("File \"F:\\ocaml\\sorting.ml\", line 65, characters 2-145:\nWarning 26: unused variable equ." 1 (1 . 145) 65 "F:\\ocaml\\sorting.ml") ("File \"/usr/share/gdesklets/display/TargetGauge.py\", line 41, in add_children" 1 nil 41 "/usr/share/gdesklets/display/TargetGauge.py") diff --git a/test/automated/ert-tests.el b/test/automated/ert-tests.el index cea994f64b8..1fe6352e1fe 100644 --- a/test/automated/ert-tests.el +++ b/test/automated/ert-tests.el @@ -228,7 +228,7 @@ failed or if there was a problem." :form (error "Foo") :condition (error "Foo") :fail-reason - "the error signalled did not have the expected type")))))) + "the error signaled did not have the expected type")))))) ;; Error of the expected type. (let* ((error nil) (test (make-ert-test @@ -258,7 +258,7 @@ failed or if there was a problem." :form (signal arith-error nil) :condition (arith-error) :fail-reason - "the error signalled did not have the expected type")))))) + "the error signaled did not have the expected type")))))) (let ((test (make-ert-test :body (lambda () (should-error (signal 'arith-error nil) @@ -275,7 +275,7 @@ failed or if there was a problem." :form (signal arith-error nil) :condition (arith-error) :fail-reason - "the error signalled did not have the expected type")))))) + "the error signaled did not have the expected type")))))) (let ((test (make-ert-test :body (lambda () (should-error (signal 'singularity-error nil) @@ -292,7 +292,7 @@ failed or if there was a problem." :form (signal singularity-error nil) :condition (singularity-error) :fail-reason - "the error signalled was a subtype of the expected type"))))) + "the error signaled was a subtype of the expected type"))))) )) (defmacro ert--test-my-list (&rest args) diff --git a/test/automated/icalendar-tests.el b/test/automated/icalendar-tests.el index 04fce7383fd..6ed1d73767a 100644 --- a/test/automated/icalendar-tests.el +++ b/test/automated/icalendar-tests.el @@ -39,7 +39,7 @@ ;; ====================================================================== (defun icalendar-tests--get-ical-event (ical-string) - "Return icalendar event for ICAL-STRING." + "Return iCalendar event for ICAL-STRING." (save-excursion (with-temp-buffer (insert ical-string) @@ -219,7 +219,7 @@ END:VTIMEZONE (should (string= "\nDTSTART;VALUE=DATE:20100215\nDTEND;VALUE=DATE:20100216" (car result))) (should (string= "subject" (cadr result))) - + ;; with time (setq result (icalendar--convert-ordinary-to-ical "&?" "&2010 2 15 12:34-23:45 s")) @@ -424,7 +424,7 @@ END:VEVENT Argument INPUT-ISO iso style diary string. Argument INPUT-EUROPEAN european style diary string. Argument INPUT-AMERICAN american style diary string. -Argument EXPECTED-OUTPUT expected icalendar result string. +Argument EXPECTED-OUTPUT expected iCalendar result string. European style input data must use german month names. American and ISO style input data must use english month names." @@ -467,7 +467,7 @@ and ISO style input data must use english month names." (defun icalendar-tests--do-test-export (input expected-output) "Actually perform export test. Argument INPUT input diary string. -Argument EXPECTED-OUTPUT expected icalendar result string." +Argument EXPECTED-OUTPUT expected iCalendar result string." (let ((temp-file (make-temp-file "icalendar-tests-ics"))) (unwind-protect (progn @@ -732,7 +732,7 @@ DTSTART;VALUE=DATE-TIME:20030919" "&9/19/2003 non-recurring allday\n") (icalendar-tests--test-import ;; do not remove the trailing blank after "long"! - "SUMMARY:long + "SUMMARY:long summary DTSTART;VALUE=DATE:20030919" "&2003/9/19 long summary\n" @@ -1041,7 +1041,7 @@ SUMMARY:event-1 "&2011/7/23 event-1\n" "&23/7/2011 event-1\n" "&7/23/2011 event-1\n") - + (icalendar-tests--test-import "BEGIN:VCALENDAR PRODID:-//Emacs//NONSGML icalendar.el//EN @@ -1111,7 +1111,7 @@ Argument INPUT icalendar event string." (progn ;; step 1: import (icalendar-import-buffer temp-diary t t) - + ;; step 2: export what was just imported (save-excursion (find-file temp-diary) @@ -1399,7 +1399,7 @@ SUMMARY:may 30 - June 1: ee") "DTSTART;VALUE=DATE:20050606 DTEND;VALUE=DATE:20050609 SUMMARY:ff") - + ;; export 2004-10-28 anniversary entries (icalendar-tests--test-export nil diff --git a/test/cedet/semantic-tests.el b/test/cedet/semantic-tests.el index c840993bf24..16dcd42c2ae 100644 --- a/test/cedet/semantic-tests.el +++ b/test/cedet/semantic-tests.el @@ -54,7 +54,7 @@ All systems are different. Ask questions along the way." (y-or-n-p "New database created. Reload system databases? ") (y-or-n-p "Load in all system databases? ")) (semanticdb-load-ebrowse-caches))) - ;; Ok, databases were creatd. Lets try some searching. + ;; Ok, databases were created. Let's try some searching. (when (not (or (eq major-mode 'c-mode) (eq major-mode 'c++-mode))) (error "Please make your default buffer be a C or C++ file, then @@ -387,4 +387,3 @@ gcc version 2.95.2 19991024 (release)" (let ((semantic-gcc-test-strings (list (semantic-gcc-query "gcc" "-v")))) (semantic-gcc-test-output-parser)) ) - diff --git a/test/cedet/semantic-utest.el b/test/cedet/semantic-utest.el index a9a7c765f2b..db737b60c6f 100644 --- a/test/cedet/semantic-utest.el +++ b/test/cedet/semantic-utest.el @@ -787,7 +787,7 @@ SKIPNAMES is a list of names to remove from NAME-CONTENTS" (defun semantic-utest-kill-indicator ( killme insertme) "Kill the line with KILLME on it and insert INSERTME in its place." (goto-char (point-min)) -; (re-search-forward (concat "/\\*" indicator "\\*/")); JAVE this isnt generic enough for different lagnuages +; (re-search-forward (concat "/\\*" indicator "\\*/")); JAVE this isn't generic enough for different languages (re-search-forward killme) (beginning-of-line) (setq semantic-utest-last-kill-pos (point)) @@ -812,7 +812,7 @@ SKIPNAMES is a list of names to remove from NAME-CONTENTS" (defun semantic-utest-last-invalid (name-contents names-removed killme insertme) "Make the last fcn invalid." (semantic-utest-kill-indicator killme insertme) -; (semantic-utest-verify-names name-contents names-removed); verify its gone ;new validator doesnt handle skipnames yet +; (semantic-utest-verify-names name-contents names-removed); verify its gone ;new validator doesn't handle skipnames yet (semantic-utest-unkill-indicator);put back killed stuff ) diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el index 10b06f5cd01..a1b8f60b2ec 100644 --- a/test/cedet/srecode-tests.el +++ b/test/cedet/srecode-tests.el @@ -177,7 +177,7 @@ It is filled with some text." (mapc (lambda (T) (when (slot-boundp T 'overlay) - (error "Overlay did not clear off of of field %s" + (error "Overlay did not clear off of field %s" (object-name T)))) fields) diff --git a/test/cedet/tests/testpolymorph.cpp b/test/cedet/tests/testpolymorph.cpp index 493b4344c17..9db2d51efe7 100644 --- a/test/cedet/tests/testpolymorph.cpp +++ b/test/cedet/tests/testpolymorph.cpp @@ -50,7 +50,7 @@ namespace fcn_poly { } -// Test 3 - Methods w/ differet arg lists. +// Test 3 - Methods w/ different arg lists. class meth_poly { public: int pm_meth(void) { @@ -128,4 +128,3 @@ namespace template_multiple_spec { // End of polymorphism test file. - diff --git a/test/indent/octave.m b/test/indent/octave.m index 768f3d85e01..5ce52ad7a19 100644 --- a/test/indent/octave.m +++ b/test/indent/octave.m @@ -3,7 +3,7 @@ function res = tcomp (fn) %% res = tcomp (fn) %% imports components and rearranges them. - + if nargin ~= 1 print_usage() end @@ -36,7 +36,7 @@ function res = tcomp (fn) endfunction ## Copyright (C) 2005, 2006, 2007, 2008, 2009 S�ren Hauberg -## +## ## This file is part of Octave. ## ## Octave is free software; you can redistribute it and/or modify it @@ -73,16 +73,16 @@ endfunction ## ## @table @code ## @item -nodeps -## The package manager will disable the dependency checking. That way it -## is possible to install a package even if it depends on another package +## The package manager will disable the dependency checking. That way it +## is possible to install a package even if it depends on another package ## that's not installed on the system. @strong{Use this option with care.} ## ## @item -noauto -## The package manager will not automatically load the installed package +## The package manager will not automatically load the installed package ## when starting Octave, even if the package requests that it is. ## ## @item -auto -## The package manager will automatically load the installed package when +## The package manager will automatically load the installed package when ## starting Octave, even if the package requests that it isn't. ## ## @item -local @@ -93,7 +93,7 @@ endfunction ## system privileges ## ## @item -verbose -## The package manager will print the output of all of the commands that are +## The package manager will print the output of all of the commands that are ## performed. ## @end table ## @@ -205,7 +205,7 @@ endfunction ## pkg global_list ## @end example ## @item rebuild -## Rebuilds the package database from the installed directories. This can +## Rebuilds the package database from the installed directories. This can ## be used in cases where for some reason the package database is corrupted. ## It can also take the @code{-auto} and @code{-noauto} options to allow the ## autoloading state of a package to be changed. For example @@ -227,7 +227,7 @@ endfunction ## @noindent ## where @code{builddir} is the name of a directory where the temporary ## installation will be produced and the binary packages will be found. -## The options @code{-verbose} and @code{-nodeps} are respected, while +## The options @code{-verbose} and @code{-nodeps} are respected, while ## the other options are ignored. ## @end table ## @end deftypefn @@ -259,7 +259,7 @@ function [local_packages, global_packages] = pkg (varargin) available_actions = {"list", "install", "uninstall", "load", ... "unload", "prefix", "local_list", ... - "global_list", "rebuild", "build","describe"}; + "global_list", "rebuild", "build","describe"}; ## Handle input if (length (varargin) == 0 || ! iscellstr (varargin)) print_usage (); @@ -321,14 +321,14 @@ function [local_packages, global_packages] = pkg (varargin) if (length (files) == 0) error ("you must specify at least one filename when calling 'pkg install'"); endif - install (files, deps, auto, prefix, archprefix, verbose, local_list, + install (files, deps, auto, prefix, archprefix, verbose, local_list, global_list, global_install); case "uninstall" if (length (files) == 0) error ("you must specify at least one package when calling 'pkg uninstall'"); endif - uninstall (files, deps, verbose, local_list, + uninstall (files, deps, verbose, local_list, global_list, global_install); case "load" @@ -406,7 +406,7 @@ function [local_packages, global_packages] = pkg (varargin) case "rebuild" if (global_install) - global_packages = rebuild (prefix, archprefix, global_list, files, + global_packages = rebuild (prefix, archprefix, global_list, files, auto, verbose); global_packages = save_order (global_packages); save (global_list, "global_packages"); @@ -414,7 +414,7 @@ function [local_packages, global_packages] = pkg (varargin) local_packages = global_packages; endif else - local_packages = rebuild (prefix, archprefix, local_list, files, auto, + local_packages = rebuild (prefix, archprefix, local_list, files, auto, verbose); local_packages = save_order (local_packages); save (local_list, "local_packages"); @@ -450,7 +450,7 @@ function [local_packages, global_packages] = pkg (varargin) otherwise error ("you can request at most two outputs when calling 'pkg describe'"); endswitch - + otherwise error ("you must specify a valid action for 'pkg'. See 'help pkg' for details"); endswitch @@ -529,7 +529,7 @@ function descriptions = rebuild (prefix, archprefix, list, files, auto, verbose) endfor if (! isempty (dup)) descriptions (dup) = []; - endif + endif endif endfunction @@ -555,7 +555,7 @@ function build (files, handle_deps, autoload, verbose) endif files(1) = []; buildlist = fullfile (builddir, "octave_packages"); - install (files, handle_deps, autoload, installdir, installdir, verbose, + install (files, handle_deps, autoload, installdir, installdir, verbose, buildlist, "", false); unwind_protect repackage (builddir, buildlist); @@ -570,7 +570,7 @@ function build (files, handle_deps, autoload, verbose) end_unwind_protect endfunction -function install (files, handle_deps, autoload, prefix, archprefix, verbose, +function install (files, handle_deps, autoload, prefix, archprefix, verbose, local_list, global_list, global_install) ## Check that the directory in prefix exist. If it doesn't: create it! @@ -583,10 +583,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, endif ## Get the list of installed packages. - [local_packages, global_packages] = installed_packages (local_list, + [local_packages, global_packages] = installed_packages (local_list, global_list); - installed_pkgs_lst = {local_packages{:}, global_packages{:}}; + installed_pkgs_lst = {local_packages{:}, global_packages{:}}; if (global_install) packages = global_packages; @@ -599,7 +599,7 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, try ## Warn about non existent files. for i = 1:length (files) - if (isempty (glob(files{i}))) + if (isempty (glob(files{i}))) warning ("file %s does not exist", files{i}); endif endfor @@ -652,32 +652,32 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, packdir = fullfile (pwd(), dirlist{3}); endif packdirs{end+1} = packdir; - + ## Make sure the package contains necessary files. verify_directory (packdir); - + ## Read the DESCRIPTION file. filename = fullfile (packdir, "DESCRIPTION"); desc = get_description (filename); - + ## Verify that package name corresponds with filename. - [dummy, nm] = fileparts (tgz); + [dummy, nm] = fileparts (tgz); if ((length (nm) >= length (desc.name)) && ! strcmp (desc.name, nm(1:length(desc.name)))) - error ("package name '%s' doesn't correspond to its filename '%s'", + error ("package name '%s' doesn't correspond to its filename '%s'", desc.name, nm); endif - + ## Set default installation directory. desc.dir = fullfile (prefix, cstrcat (desc.name, "-", desc.version)); - - ## Set default architectire dependent installation directory. + + ## Set default architecture dependent installation directory. desc.archprefix = fullfile (archprefix, cstrcat (desc.name, "-", desc.version)); - + ## Save desc. descriptions{end+1} = desc; - + ## Are any of the new packages already installed? ## If so we'll remove the old version. for j = 1:length (packages) @@ -705,14 +705,14 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, if (global_install) ## Global installation is not allowed to have dependencies on locally ## installed packages. - idx1 = complement (packages_to_uninstall, + idx1 = complement (packages_to_uninstall, 1:length(global_packages)); pseudo_installed_packages = {global_packages{idx1}, ... descriptions{idx2}}; else - idx1 = complement (packages_to_uninstall, + idx1 = complement (packages_to_uninstall, 1:length(local_packages)); - pseudo_installed_packages = {local_packages{idx1}, ... + pseudo_installed_packages = {local_packages{idx1}, ... global_packages{:}, ... descriptions{idx2}}; endif @@ -755,10 +755,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, try for i = packages_to_uninstall if (global_install) - uninstall ({global_packages{i}.name}, false, verbose, local_list, + uninstall ({global_packages{i}.name}, false, verbose, local_list, global_list, global_install); else - uninstall ({local_packages{i}.name}, false, verbose, local_list, + uninstall ({local_packages{i}.name}, false, verbose, local_list, global_list, global_install); endif endfor @@ -809,7 +809,7 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, ## requested that it is, then mark the package as autoloaded. for i = length (descriptions):-1:1 if (autoload > 0 || (autoload == 0 && isautoload (descriptions(i)))) - fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", + fclose (fopen (fullfile (descriptions{i}.dir, "packinfo", ".autoload"), "wt")); descriptions{i}.autoload = 1; endif @@ -872,10 +872,10 @@ function install (files, handle_deps, autoload, prefix, archprefix, verbose, endif endfunction -function uninstall (pkgnames, handle_deps, verbose, local_list, +function uninstall (pkgnames, handle_deps, verbose, local_list, global_list, global_install) ## Get the list of installed packages. - [local_packages, global_packages] = installed_packages(local_list, + [local_packages, global_packages] = installed_packages(local_list, global_list); if (global_install) installed_pkgs_lst = {local_packages{:}, global_packages{:}}; @@ -996,13 +996,13 @@ function uninstall (pkgnames, handle_deps, verbose, local_list, endfunction -function [pkg_desc_list, flag] = describe (pkgnames, verbose, +function [pkg_desc_list, flag] = describe (pkgnames, verbose, local_list, global_list) ## Get the list of installed packages. installed_pkgs_lst = installed_packages(local_list, global_list); num_packages = length (installed_pkgs_lst); - + describe_all = false; if (any (strcmp ("all", pkgnames))) @@ -1043,7 +1043,7 @@ function [pkg_desc_list, flag] = describe (pkgnames, verbose, non_inst_str = sprintf (" %s ", pkgnames{non_inst}); error ("some packages are not installed: %s", non_inst_str); else - pkg_desc_list{non_inst} = struct ("name", {}, "description", + pkg_desc_list{non_inst} = struct ("name", {}, "description", {}, "provides", {}); endif endif @@ -1052,7 +1052,7 @@ function [pkg_desc_list, flag] = describe (pkgnames, verbose, for i = 1:num_pkgnames print_package_description (pkg_desc_list{i}.name, pkg_desc_list{i}.version, - pkg_desc_list{i}.provides, + pkg_desc_list{i}.provides, pkg_desc_list{i}.description, flag{i}, verbose); endfor @@ -1069,12 +1069,12 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) if (! exist (index_file, "file")) error ("could not find any INDEX file in directory %s, try 'pkg rebuild all' to generate missing INDEX files", packdir); - endif + endif + - [fid, msg] = fopen (index_file, "r"); if (fid == -1) - error ("the INDEX file %s could not be read: %s", + error ("the INDEX file %s could not be read: %s", index_file, msg); endif @@ -1089,7 +1089,7 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) while (! feof (fid) || line != -1) if (! any (! isspace (line)) || line(1) == "#" || any (line == "=")) - ## Comments, blank lines or comments about unimplemented + ## Comments, blank lines or comments about unimplemented ## functions: do nothing ## FIXME: probably comments and pointers to external functions ## could be treated better when printing to screen? @@ -1114,7 +1114,7 @@ function [pkg_idx_struct] = parse_pkg_idx (packdir) fclose (fid); endfunction -function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, +function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, pkg_desc, status, verbose) printf ("---\nPackage name:\n\t%s\n", pkg_name); @@ -1122,7 +1122,7 @@ function print_package_description (pkg_name, pkg_ver, pkg_idx_struct, printf ("Short description:\n\t%s\n", pkg_desc); printf ("Status:\n\t%s\n", status); if (verbose) - printf ("---\nProvides:\n"); + printf ("---\nProvides:\n"); for i = 1:length(pkg_idx_struct) if (! isempty (pkg_idx_struct{i}.functions)) printf ("%s\n", pkg_idx_struct{i}.category); @@ -1177,26 +1177,26 @@ function repackage (builddir, buildlist) unlink (fullfile (pack.name, "inst", "PKG_DEL")); endif if (exist (fullfile (archdir, "PKG_ADD"), "file")) - movefile (fullfile (archdir, "PKG_ADD"), + movefile (fullfile (archdir, "PKG_ADD"), fullfile (pack.name, "PKG_ADD")); endif if (exist (fullfile (archdir, "PKG_DEL"), "file")) - movefile (fullfile (archdir, "PKG_DEL"), - fullfile (pack.name, "PKG_DEL")); + movefile (fullfile (archdir, "PKG_DEL"), + fullfile (pack.name, "PKG_DEL")); endif else if (exist (fullfile (pack.name, "inst", "PKG_ADD"), "file")) - movefile (fullfile (pack.name, "inst", "PKG_ADD"), + movefile (fullfile (pack.name, "inst", "PKG_ADD"), fullfile (pack.name, "PKG_ADD")); - endif + endif if (exist (fullfile (pack.name, "inst", "PKG_DEL"), "file")) - movefile (fullfile (pack.name, "inst", "PKG_DEL"), - fullfile (pack.name, "PKG_DEL")); - endif - endif + movefile (fullfile (pack.name, "inst", "PKG_DEL"), + fullfile (pack.name, "PKG_DEL")); + endif + endif tfile = cstrcat (pack.name, "-", pack.version, ".tar"); tar (tfile, pack.name); - try + try gzip (tfile); unlink (tfile); catch @@ -1231,7 +1231,7 @@ function prepare_installation (desc, packdir) wd = pwd (); try cd (packdir); - pre_install (desc); + pre_install (desc); cd (wd); catch cd (wd); @@ -1245,13 +1245,13 @@ function prepare_installation (desc, packdir) [status, msg] = mkdir (inst_dir); if (status != 1) rm_rf (desc.dir); - error ("the 'inst' directory did not exist and could not be created: %s", + error ("the 'inst' directory did not exist and could not be created: %s", msg); endif endif endfunction -function configure_make (desc, packdir, verbose) +function configure_make (desc, packdir, verbose) ## Perform ./configure, make, make install in "src". if (exist (fullfile (packdir, "src"), "dir")) src = fullfile (packdir, "src"); @@ -1362,7 +1362,7 @@ function configure_make (desc, packdir, verbose) printf (" %s", archdependent{:}); printf (" %s\n", archdir); endif - if (! exist (archdir, "dir")) + if (! exist (archdir, "dir")) mkdir (archdir); endif [status, output] = copyfile (archdependent, archdir); @@ -1398,8 +1398,8 @@ endfunction function create_pkgadddel (desc, packdir, nm, global_install) instpkg = fullfile (desc.dir, nm); instfid = fopen (instpkg, "wt"); - ## If it is exists, most of the PKG_* file should go into the - ## architecture dependent directory so that the autoload/mfilename + ## If it is exists, most of the PKG_* file should go into the + ## architecture dependent directory so that the autoload/mfilename ## commands work as expected. The only part that doesn't is the ## part in the main directory. archdir = fullfile (getarchprefix (desc), cstrcat (desc.name, "-", @@ -1465,7 +1465,7 @@ function copy_files (desc, packdir, global_install) if (! exist (desc.dir, "dir")) [status, output] = mkdir (desc.dir); if (status != 1) - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", desc.dir, output); endif endif @@ -1493,32 +1493,32 @@ function copy_files (desc, packdir, global_install) [status, output] = mkdir (octm3); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm3, output); endif endif [status, output] = mkdir (octm2); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm2, output); endif endif [status, output] = mkdir (octm1); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octm1, output); endif endif [status, output] = mkdir (octfiledir); if (status != 1) rm_rf (desc.dir); - error ("couldn't create installation directory %s : %s", + error ("couldn't create installation directory %s : %s", octfiledir, output); endif endif - [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), + [status, output] = movefile (fullfile (desc.dir, getarch (), "*"), octfiledir); rm_rf (fullfile (desc.dir, getarch ())); @@ -1753,7 +1753,7 @@ function deps_cell = fix_depends (depends) version = fix_version (parts{2}); ## If no version is specified for the dependency - ## we say that the version should be greater than + ## we say that the version should be greater than ## or equal to "0.0.0". else package = tolower (strip (dep)); @@ -1813,7 +1813,7 @@ function write_index (desc, dir, index_file, global_install) if (err) error ("couldn't read directory %s: %s", tmpdir, msg); endif - files = [files; files2]; + files = [files; files2]; endif functions = {}; @@ -1910,7 +1910,7 @@ function [out1, out2] = installed_packages (local_list, global_list) endfor if (! isempty(dup)) installed_pkgs_lst(dup) = []; - endif + endif ## Now check if the package is loaded. tmppath = strrep (path(), "\\", "/"); @@ -1957,9 +1957,9 @@ function [out1, out2] = installed_packages (local_list, global_list) h1 = "Package Name"; h2 = "Version"; h3 = "Installation directory"; - max_name_length = length (h1); + max_name_length = length (h1); max_version_length = length (h2); - names = cell (num_packages, 1); + names = cell (num_packages, 1); for i = 1:num_packages max_name_length = max (max_name_length, length (installed_pkgs_lst{i}.name)); @@ -1996,7 +1996,7 @@ function [out1, out2] = installed_packages (local_list, global_list) first_char = length (cur_dir) - max_dir_length + 4; first_filesep = strfind (cur_dir(first_char:end), filesep()); if (! isempty (first_filesep)) - cur_dir = cstrcat ("...", + cur_dir = cstrcat ("...", cur_dir((first_char + first_filesep(1) - 1):end)); else cur_dir = cstrcat ("...", cur_dir(first_char:end)); @@ -2026,7 +2026,7 @@ function load_packages (files, handle_deps, local_list, global_list) if (length (files) == 1 && strcmp (files{1}, "all")) idx = [1:length(installed_pkgs_lst)]; ## Load auto. - elseif (length (files) == 1 && strcmp (files{1}, "auto")) + elseif (length (files) == 1 && strcmp (files{1}, "auto")) idx = []; for i = 1:length (installed_pkgs_lst) if (exist (fullfile (pdirs{i}, "packinfo", ".autoload"), "file")) @@ -2162,7 +2162,7 @@ endfunction function archprefix = getarchprefix (desc, global_install) if ((nargin == 2 && global_install) || (nargin < 2 && issuperuser ())) - archprefix = fullfile (octave_config_info ("libexecdir"), "octave", + archprefix = fullfile (octave_config_info ("libexecdir"), "octave", "packages", cstrcat(desc.name, "-", desc.version)); else archprefix = desc.dir; @@ -2207,7 +2207,7 @@ function newdesc = save_order (desc) newdesc = {}; for i = 1 : length(desc) deps = desc{i}.depends; - if (isempty (deps) || (length (deps) == 1 && + if (isempty (deps) || (length (deps) == 1 && strcmp(deps{1}.package, "octave"))) newdesc {end + 1} = desc{i}; else @@ -2220,7 +2220,7 @@ function newdesc = save_order (desc) endif endfor endfor - if (! isempty (tmpdesc)) + if (! isempty (tmpdesc)) newdesc = {newdesc{:}, save_order(tmpdesc){:}, desc{i}}; else newdesc{end+1} = desc{i}; @@ -2278,7 +2278,7 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) else if (handle_deps) deps = installed_pkgs_lst{i}.depends; - if ((length (deps) > 1) || (length (deps) == 1 && + if ((length (deps) > 1) || (length (deps) == 1 && ! strcmp(deps{1}.package, "octave"))) tmplidx = []; for k = 1 : length (deps) @@ -2289,7 +2289,7 @@ function idx = load_package_dirs (lidx, idx, handle_deps, installed_pkgs_lst) endif endfor endfor - idx = load_package_dirs (tmplidx, idx, handle_deps, + idx = load_package_dirs (tmplidx, idx, handle_deps, installed_pkgs_lst); endif endif |
