Now on revision 106361. ------------------------------------------------------------ revno: 106361 committer: Paul Eggert branch nick: trunk timestamp: Sat 2011-11-12 23:48:23 -0800 message: Spelling fixes. diff: === modified file 'admin/charsets/cp51932.awk' --- admin/charsets/cp51932.awk 2011-01-15 22:46:51 +0000 +++ admin/charsets/cp51932.awk 2011-11-13 07:48:23 +0000 @@ -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. === modified file 'admin/notes/bzr' --- admin/notes/bzr 2011-09-01 07:24:27 +0000 +++ admin/notes/bzr 2011-11-13 07:48:23 +0000 @@ -173,7 +173,7 @@ 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 === modified file 'doc/lispref/files.texi' --- doc/lispref/files.texi 2011-09-24 22:49:32 +0000 +++ doc/lispref/files.texi 2011-11-13 07:48:23 +0000 @@ -2827,7 +2827,7 @@ 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 === modified file 'lib-src/etags.c' --- lib-src/etags.c 2011-09-09 01:06:52 +0000 +++ lib-src/etags.c 2011-11-13 07:48:23 +0000 @@ -6097,7 +6097,7 @@ 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; === modified file 'lisp/cedet/semantic/format.el' --- lisp/cedet/semantic/format.el 2011-02-28 01:07:29 +0000 +++ lisp/cedet/semantic/format.el 2011-11-13 07:48:23 +0000 @@ -291,7 +291,7 @@ ;; 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) === modified file 'lisp/cedet/semantic/html.el' --- lisp/cedet/semantic/html.el 2011-11-03 20:03:45 +0000 +++ lisp/cedet/semantic/html.el 2011-11-13 07:48:23 +0000 @@ -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 === modified file 'lisp/cedet/semantic/texi.el' --- lisp/cedet/semantic/texi.el 2011-11-03 20:03:45 +0000 +++ lisp/cedet/semantic/texi.el 2011-11-13 07:48:23 +0000 @@ -421,7 +421,7 @@ 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))) === modified file 'lisp/cedet/srecode/mode.el' --- lisp/cedet/srecode/mode.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/mode.el 2011-11-13 07:48:23 +0000 @@ -366,7 +366,7 @@ (define-key srecode-prefix-map oldkey nil) ))) - ;; Update Keybings + ;; Update Keybindings (let ((oldbinding (lookup-key srecode-prefix-map binding))) ;; During development, allow overrides. === modified file 'lisp/emacs-lisp/eieio-opt.el' --- lisp/emacs-lisp/eieio-opt.el 2011-02-18 08:00:08 +0000 +++ lisp/emacs-lisp/eieio-opt.el 2011-11-13 07:48:23 +0000 @@ -92,7 +92,7 @@ (princ "Class ") (prin1 class) (terpri) - ;; Inheritence tree information + ;; Inheritance tree information (let ((pl (class-parents class))) (when pl (princ " Inherits from ") === modified file 'lisp/emacs-lisp/eieio.el' --- lisp/emacs-lisp/eieio.el 2011-08-23 18:53:51 +0000 +++ lisp/emacs-lisp/eieio.el 2011-11-13 07:48:23 +0000 @@ -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. === modified file 'lisp/emulation/viper-cmd.el' --- lisp/emulation/viper-cmd.el 2011-10-30 03:39:11 +0000 +++ lisp/emulation/viper-cmd.el 2011-11-13 07:48:23 +0000 @@ -1599,7 +1599,7 @@ ;; 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)) === modified file 'lisp/erc/erc-backend.el' --- lisp/erc/erc-backend.el 2011-05-03 08:37:51 +0000 +++ lisp/erc/erc-backend.el 2011-11-13 07:48:23 +0000 @@ -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 @@ ;; Local Variables: ;; indent-tabs-mode: nil ;; End: - === modified file 'lisp/eshell/esh-var.el' --- lisp/eshell/esh-var.el 2011-03-05 20:07:27 +0000 +++ lisp/eshell/esh-var.el 2011-11-13 07:48:23 +0000 @@ -344,7 +344,7 @@ (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 === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-11-03 23:28:52 +0000 +++ lisp/gnus/gnus-sum.el 2011-11-13 07:48:23 +0000 @@ -4727,7 +4727,7 @@ (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) === modified file 'lisp/htmlfontify.el' --- lisp/htmlfontify.el 2011-04-19 13:44:55 +0000 +++ lisp/htmlfontify.el 2011-11-13 07:48:23 +0000 @@ -432,8 +432,8 @@ (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 ))) )) === modified file 'lisp/international/quail.el' --- lisp/international/quail.el 2011-06-01 19:32:04 +0000 +++ lisp/international/quail.el 2011-11-13 07:48:23 +0000 @@ -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 @@ (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 @@ (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 @@ -2125,7 +2125,7 @@ (- 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 @@ (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))) @@ -2787,7 +2787,7 @@ (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) === modified file 'lisp/international/robin.el' --- lisp/international/robin.el 2011-11-09 06:10:51 +0000 +++ lisp/international/robin.el 2011-11-13 07:48:23 +0000 @@ -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. === modified file 'lisp/mh-e/mh-e.el' --- lisp/mh-e/mh-e.el 2011-09-20 04:56:51 +0000 +++ lisp/mh-e/mh-e.el 2011-11-13 07:48:23 +0000 @@ -2447,7 +2447,7 @@ "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 === modified file 'lisp/net/dbus.el' --- lisp/net/dbus.el 2011-09-25 15:56:28 +0000 +++ lisp/net/dbus.el 2011-11-13 07:48:23 +0000 @@ -145,7 +145,7 @@ (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 === modified file 'lisp/net/soap-client.el' --- lisp/net/soap-client.el 2011-06-30 23:15:02 +0000 +++ lisp/net/soap-client.el 2011-11-13 07:48:23 +0000 @@ -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. === modified file 'lisp/net/webjump.el' --- lisp/net/webjump.el 2011-05-23 17:57:17 +0000 +++ lisp/net/webjump.el 2011-11-13 07:48:23 +0000 @@ -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") === modified file 'lisp/progmodes/cc-fonts.el' --- lisp/progmodes/cc-fonts.el 2011-10-27 20:34:23 +0000 +++ lisp/progmodes/cc-fonts.el 2011-11-13 07:48:23 +0000 @@ -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" === modified file 'lisp/progmodes/ebnf2ps.el' --- lisp/progmodes/ebnf2ps.el 2011-03-05 21:56:00 +0000 +++ lisp/progmodes/ebnf2ps.el 2011-11-13 07:48:23 +0000 @@ -4007,7 +4007,7 @@ /#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 === modified file 'lisp/progmodes/modula2.el' --- lisp/progmodes/modula2.el 2011-01-15 23:16:57 +0000 +++ lisp/progmodes/modula2.el 2011-11-13 07:48:23 +0000 @@ -466,7 +466,7 @@ '(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) === modified file 'lisp/progmodes/ps-mode.el' --- lisp/progmodes/ps-mode.el 2011-06-15 14:07:48 +0000 +++ lisp/progmodes/ps-mode.el 2011-11-13 07:48:23 +0000 @@ -624,7 +624,7 @@ (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) === modified file 'lisp/term.el' --- lisp/term.el 2011-08-21 17:56:19 +0000 +++ lisp/term.el 2011-11-13 07:48:23 +0000 @@ -4249,7 +4249,7 @@ "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") === modified file 'lisp/textmodes/conf-mode.el' --- lisp/textmodes/conf-mode.el 2011-01-26 08:36:39 +0000 +++ lisp/textmodes/conf-mode.el 2011-11-13 07:48:23 +0000 @@ -417,7 +417,7 @@ (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) === modified file 'lisp/textmodes/ispell.el' --- lisp/textmodes/ispell.el 2011-10-20 00:26:14 +0000 +++ lisp/textmodes/ispell.el 2011-11-13 07:48:23 +0000 @@ -2783,7 +2783,7 @@ (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 === modified file 'lisp/textmodes/sgml-mode.el' --- lisp/textmodes/sgml-mode.el 2011-11-11 23:17:16 +0000 +++ lisp/textmodes/sgml-mode.el 2011-11-13 07:48:23 +0000 @@ -1897,7 +1897,7 @@ ("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") === modified file 'src/ChangeLog.7' --- src/ChangeLog.7 2011-01-26 08:36:39 +0000 +++ src/ChangeLog.7 2011-11-13 07:48:23 +0000 @@ -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 @@ -972,7 +972,7 @@ 1998-06-01 Ken'ichi Handa - * coding.c (detect_coding_mask): Initilize local variable C. + * coding.c (detect_coding_mask): Initialize local variable C. 1998-06-01 Richard Stallman @@ -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 - * 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. ------------------------------------------------------------ revno: 106360 committer: Glenn Morris branch nick: trunk timestamp: Sat 2011-11-12 17:03:55 -0800 message: * INSTALL: Tiny updates for disk space used during installation. diff: === modified file 'ChangeLog' --- ChangeLog 2011-11-05 11:34:56 +0000 +++ ChangeLog 2011-11-13 01:03:55 +0000 @@ -1,3 +1,7 @@ +2011-11-13 Glenn Morris + + * INSTALL: Tiny updates for disk space used during installation. + 2011-11-05 Eli Zaretskii * lib/makefile.w32-in (FRC): New dummy target. === modified file 'INSTALL' --- INSTALL 2011-09-28 17:49:09 +0000 +++ INSTALL 2011-11-13 01:03:55 +0000 @@ -31,9 +31,9 @@ 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. ------------------------------------------------------------ revno: 106359 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-11-12 14:11:54 +0200 message: Allow building temacs with a larger heap on MS-Windows. src/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. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-12 11:56:57 +0000 +++ src/ChangeLog 2011-11-12 12:11:54 +0000 @@ -1,5 +1,10 @@ 2011-11-12 Eli Zaretskii + * 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. === modified file 'src/makefile.w32-in' --- src/makefile.w32-in 2011-11-05 22:55:08 +0000 +++ src/makefile.w32-in 2011-11-12 12:11:54 +0000 @@ -24,6 +24,9 @@ # 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): $(TLIB0) $(TLIB1) $(TLIB2) $(TLASTLIB) $(TOBJ) $(TRES) \ ../nt/$(BLD)/addsection.exe $(GNULIB) $(LINK) $(LINK_OUT)$(TEMACS_TMP) $(FULL_LINK_FLAGS) $(TOBJ) $(TRES) $(LIBS) - "$(THISDIR)/../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. ------------------------------------------------------------ revno: 106358 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-11-12 13:56:57 +0200 message: Verify glyph row's hash values. src/dispnew.c (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. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-12 10:09:38 +0000 +++ src/ChangeLog 2011-11-12 11:56:57 +0000 @@ -2,6 +2,9 @@ * 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 === modified file 'src/dispnew.c' --- src/dispnew.c 2011-11-12 10:09:38 +0000 +++ src/dispnew.c 2011-11-12 11:56:57 +0000 @@ -429,6 +429,25 @@ return n; } +#if XASSERTS +/* Return non-zero if ROW's hash value is correct, zero if not. */ +int +verify_row_hash (struct glyph_row *row) +{ + int area, k; + unsigned row_hash = 0; + + for (area = LEFT_MARGIN_AREA; area < LAST_AREA; ++area) + for (k = 0; k < row->used[area]; ++k) + row_hash = ((((row_hash << 4) + (row_hash >> 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 row_hash == row->hash; +} +#endif /* Adjust glyph matrix MATRIX on window W or on a frame to changed window sizes. @@ -600,6 +619,7 @@ row->glyphs[LAST_AREA] = row->glyphs[LEFT_MARGIN_AREA] + dim.width; } + xassert (!row->enabled_p || verify_row_hash (row)); ++row; } } @@ -1271,6 +1291,9 @@ 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) ------------------------------------------------------------ revno: 106357 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2011-11-12 12:09:38 +0200 message: dispnew.c (scrolling_window): Fix index usage. src/dispnew.c (scrolling_window): Fix incorrect indices in accessing current_matrix and desired_matrix. (Bug#9990) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-12 09:55:50 +0000 +++ src/ChangeLog 2011-11-12 10:09:38 +0000 @@ -1,3 +1,8 @@ +2011-11-12 Eli Zaretskii + + * dispnew.c (scrolling_window): Fix incorrect indices in accessing + current_matrix and desired_matrix. (Bug#9990) + 2011-11-12 Martin Rudalics * window.h (window): Remove splits slot. === modified file 'src/dispnew.c' --- src/dispnew.c 2011-10-08 10:58:50 +0000 +++ src/dispnew.c 2011-11-12 10:09:38 +0000 @@ -4334,10 +4334,10 @@ 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; ------------------------------------------------------------ revno: 106356 committer: martin rudalics branch nick: trunk timestamp: Sat 2011-11-12 10:55:50 +0100 message: Don't handle splits status. * 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. * 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. * windows.texi (Splitting Windows, Deleting Windows): Remove references to splits status of windows. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-11-10 02:17:45 +0000 +++ doc/lispref/ChangeLog 2011-11-12 09:55:50 +0000 @@ -1,3 +1,8 @@ +2011-11-12 Martin Rudalics + + * windows.texi (Splitting Windows, Deleting Windows): Remove + references to splits status of windows. + 2011-11-10 Glenn Morris * buffers.texi (Read Only Buffers): Expand a bit on why === modified file 'doc/lispref/windows.texi' --- doc/lispref/windows.texi 2011-11-09 14:37:25 +0000 +++ doc/lispref/windows.texi 2011-11-12 09:55:50 +0000 @@ -855,43 +855,14 @@ this may allow @code{split-window} to succeed even if @var{window} is a fixed-size window or too small to ordinarily split. -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. +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. -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. +The setting of this variable has no effect if @code{window-nest} (see +below) is non-@code{nil}. @end defopt -@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. - -@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. - -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 - To illustrate the use of @code{window-splits} consider the following window configuration: @smallexample @@ -1208,12 +1179,11 @@ function, that function is called with @var{window} as its sole argument. -If the splits status of @var{window} (@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 @code{window-splits} (@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 @code{window-splits} 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 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-12 02:13:23 +0000 +++ lisp/ChangeLog 2011-11-12 09:55:50 +0000 @@ -1,3 +1,10 @@ +2011-11-12 Martin Rudalics + + * 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 * apropos.el (apropos-do-all, apropos-library, apropos-value) === modified file 'lisp/window.el' --- lisp/window.el 2011-11-11 10:23:23 +0000 +++ lisp/window.el 2011-11-12 09:55:50 +0000 @@ -1482,12 +1482,12 @@ ((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-splits) (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-splits 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) @@ -2389,8 +2389,7 @@ (sibling (or (window-left window) (window-right window)))) (window--resize-reset frame horizontal) (cond - ((and (not (window-splits window)) - sibling (window-sizable-p sibling size)) + ((and (not window-splits) sibling (window-sizable-p sibling size)) ;; Resize WINDOW's sibling. (window--resize-this-window sibling size horizontal nil t) (set-window-new-normal @@ -3585,7 +3584,6 @@ (total-width . ,(window-total-size window t)) (normal-height . ,(window-normal-size window)) (normal-width . ,(window-normal-size window t)) - (splits . ,(window-splits window)) (nest . ,(window-nest window)) ,@(let (list) (dolist (parameter (window-parameters window)) @@ -3740,7 +3738,6 @@ (nest (cdr (assq 'nest 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)) ;; Process parameters. (when parameters @@ -3828,7 +3825,7 @@ (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))) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-11 18:33:30 +0000 +++ src/ChangeLog 2011-11-12 09:55:50 +0000 @@ -1,3 +1,14 @@ +2011-11-12 Martin Rudalics + + * 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 * xfns.c (unwind_create_frame): === modified file 'src/window.c' --- src/window.c 2011-11-09 14:29:23 +0000 +++ src/window.c 2011-11-12 09:55:50 +0000 @@ -465,41 +465,6 @@ return decode_any_window (window)->prev; } -DEFUN ("window-splits", Fwindow_splits, Swindow_splits, 0, 1, 0, - doc: /* Return splits status for the window WINDOW. -If WINDOW is omitted or nil, it defaults to the selected window. - -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. - -If the value returned by this function is non-nil, resizing and deleting -WINDOW may resize all windows in the same combination. */) - (Lisp_Object window) -{ - return decode_any_window (window)->splits; -} - -DEFUN ("set-window-splits", Fset_window_splits, Sset_window_splits, 2, 2, 0, - doc: /* Set splits status of window WINDOW to 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. */) - (Lisp_Object window, Lisp_Object status) -{ - register struct window *w = decode_any_window (window); - - w->splits = status; - - return w->splits; -} - DEFUN ("window-nest", Fwindow_nest, Swindow_nest, 0, 1, 0, doc: /* Return nest status of window WINDOW. If WINDOW is omitted or nil, it defaults to the selected window. @@ -2769,9 +2734,6 @@ replace_window (root, window, 1); - /* Reset WINDOW's splits status. */ - w->splits = Qnil; - /* This must become SWINDOW anyway ....... */ if (!NILP (w->buffer) && !resize_failed) { @@ -3286,7 +3248,6 @@ p->start = Qnil; p->pointm = Qnil; p->buffer = Qnil; - p->splits = Qnil; p->nest = Qnil; p->window_parameters = Qnil; } @@ -3334,7 +3295,7 @@ 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->nest = w->window_parameters = Qnil; w->prev_buffers = w->next_buffers = Qnil; /* Initialize non-Lisp data. */ w->desired_matrix = w->current_matrix = 0; @@ -3776,10 +3737,6 @@ 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; /* These get applied below. */ p->new_total = horflag ? o->total_cols : o->total_lines; p->new_normal = new_normal; @@ -3830,9 +3787,6 @@ 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) { @@ -3972,7 +3926,6 @@ PARENT (the nest 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. */ @@ -5359,7 +5312,7 @@ 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 nest, window_parameters; }; #define SAVED_WINDOW_N(swv,n) \ @@ -5590,7 +5543,6 @@ 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->window_parameters = p->window_parameters; XSETFASTINT (w->last_modified, 0); @@ -5869,7 +5821,6 @@ 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->window_parameters = w->window_parameters; if (!NILP (w->buffer)) @@ -6333,7 +6284,7 @@ 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, nest and the like. This might have to be fixed. */ int compare_window_configurations (Lisp_Object configuration1, Lisp_Object configuration2, int ignore_positions) @@ -6545,16 +6496,7 @@ 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. */); +This variable takes no effect if `window-nest' is non-nil. */); Vwindow_splits = Qnil; DEFVAR_LISP ("window-nest", Vwindow_nest, @@ -6591,8 +6533,6 @@ 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_use_time); === modified file 'src/window.h' --- src/window.h 2011-11-07 09:51:08 +0000 +++ src/window.h 2011-11-12 09:55:50 +0000 @@ -258,10 +258,6 @@ 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; ------------------------------------------------------------ revno: 106355 committer: Glenn Morris branch nick: trunk timestamp: Fri 2011-11-11 21:13:23 -0500 message: apropos.el doc fixes. * lisp/apropos.el (apropos-do-all, apropos-library, apropos-value) (apropos-documentation): Doc fixes. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-11 23:17:16 +0000 +++ lisp/ChangeLog 2011-11-12 02:13:23 +0000 @@ -1,3 +1,8 @@ +2011-11-12 Glenn Morris + + * apropos.el (apropos-do-all, apropos-library, apropos-value) + (apropos-documentation): Doc fixes. + 2011-11-11 Juanma Barranquero * progmodes/idlw-shell.el (idlwave-shell-make-new-bp-overlay): === modified file 'lisp/apropos.el' --- lisp/apropos.el 2011-05-06 19:59:17 +0000 +++ lisp/apropos.el 2011-11-12 02:13:23 +0000 @@ -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 @@ (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 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 @@ 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)