Now on revision 106355. ------------------------------------------------------------ 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) ------------------------------------------------------------ revno: 106354 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2011-11-12 00:34:43 +0100 message: Fix more typos. diff: === modified file 'lisp/ChangeLog.12' --- lisp/ChangeLog.12 2011-03-01 15:18:53 +0000 +++ lisp/ChangeLog.12 2011-11-11 23:34:43 +0000 @@ -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. === modified file 'lisp/ChangeLog.15' --- lisp/ChangeLog.15 2011-10-18 06:52:32 +0000 +++ lisp/ChangeLog.15 2011-11-11 23:34:43 +0000 @@ -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 === modified file 'lisp/cedet/semantic/scope.el' --- lisp/cedet/semantic/scope.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/scope.el 2011-11-11 23:34:43 +0000 @@ -426,7 +426,7 @@ ;; Collect all the types (class, etc) that are in our heratage. ;; 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) === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-11-11 23:17:16 +0000 +++ lisp/org/ChangeLog 2011-11-11 23:34:43 +0000 @@ -1969,7 +1969,7 @@ 2011-07-28 Carsten Dominik - * 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 @@ -2123,11 +2123,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' - variable. - (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-autokey): Make use of new `org-bibtex-key-property' + variable. + (org-bibtex-fleshout): Make use of new `org-bibtex-key-property' + variable. + (org-bibtex-write): Make use of new `org-bibtex-key-property' variable. 2011-07-28 Eric Schulte @@ -2251,7 +2251,7 @@ 2011-07-28 Manuel Giraud * org-html.el (org-html-handle-links): Add an alternate for inline - images + images. 2011-07-28 Carsten Dominik @@ -2297,7 +2297,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 @@ -2347,7 +2347,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 @@ -2898,12 +2898,12 @@ 2011-07-28 Bernt Hansen * 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 * org-clock.el (org-clock-in): Set default clocking task when - already clocking the task + already clocking the task. 2011-07-28 Nicolas Goaziou @@ -3049,7 +3049,7 @@ 2011-07-28 Bastien Guerry * org.el (org-refile-get-targets): Rename from - `org-get-refile-targets.' + `org-get-refile-targets'. 2011-07-28 Bastien Guerry @@ -3731,7 +3731,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 @@ -4778,7 +4778,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 @@ -4859,7 +4859,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 @@ -5007,7 +5007,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 @@ -16837,7 +16837,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 === modified file 'src/ChangeLog.3' --- src/ChangeLog.3 2011-02-28 01:07:29 +0000 +++ src/ChangeLog.3 2011-11-11 23:34:43 +0000 @@ -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. === modified file 'src/ChangeLog.9' --- src/ChangeLog.9 2011-09-28 00:59:28 +0000 +++ src/ChangeLog.9 2011-11-11 23:34:43 +0000 @@ -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. ------------------------------------------------------------ revno: 106353 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2011-11-12 00:17:16 +0100 message: Fix typos. diff: === modified file 'admin/grammars/python.wy' --- admin/grammars/python.wy 2011-08-04 00:58:07 +0000 +++ admin/grammars/python.wy 2011-11-11 23:17:16 +0000 @@ -828,7 +828,7 @@ ; ;; 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 === modified file 'admin/nt/README-ftp-server' --- admin/nt/README-ftp-server 2011-10-28 15:03:13 +0000 +++ admin/nt/README-ftp-server 2011-11-11 23:17:16 +0000 @@ -92,7 +92,7 @@ or libpng.dll. LibPNG requires zlib, which should come from the same source as you got libpng. - 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 === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-11-01 19:22:57 +0000 +++ doc/misc/ChangeLog 2011-11-11 23:17:16 +0000 @@ -1,3 +1,7 @@ +2011-11-11 Juanma Barranquero + + * semantic.texi (Tag handling): Fix typo. + 2011-10-31 Katsumi Yamaoka * gnus.texi (Other Gnus Versions): Remove. === modified file 'doc/misc/semantic.texi' --- doc/misc/semantic.texi 2011-02-28 01:07:29 +0000 +++ doc/misc/semantic.texi 2011-11-11 23:17:16 +0000 @@ -306,7 +306,7 @@ 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 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-11 15:55:24 +0000 +++ lisp/ChangeLog 2011-11-11 23:17:16 +0000 @@ -1,3 +1,8 @@ +2011-11-11 Juanma Barranquero + + * progmodes/idlw-shell.el (idlwave-shell-make-new-bp-overlay): + * textmodes/sgml-mode.el (html-tag-help): Fix typos. + 2011-11-11 Stefan Monnier * electric.el (electric-indent-post-self-insert-function): Make it === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2011-01-25 04:08:28 +0000 +++ lisp/ChangeLog.9 2011-11-11 23:17:16 +0000 @@ -2628,7 +2628,7 @@ 2001-07-06 Vinicius Jose Latorre - * 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. === modified file 'lisp/cedet/semantic/bovine/c.el' --- lisp/cedet/semantic/bovine/c.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/bovine/c.el 2011-11-11 23:17:16 +0000 @@ -249,7 +249,7 @@ (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))) === modified file 'lisp/cedet/semantic/decorate/include.el' --- lisp/cedet/semantic/decorate/include.el 2011-11-03 20:03:45 +0000 +++ lisp/cedet/semantic/decorate/include.el 2011-11-11 23:17:16 +0000 @@ -296,7 +296,7 @@ ;; 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)) ) === modified file 'lisp/cedet/semantic/tag-file.el' --- lisp/cedet/semantic/tag-file.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/semantic/tag-file.el 2011-11-11 23:17:16 +0000 @@ -154,7 +154,7 @@ (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 === modified file 'lisp/cedet/srecode/getset.el' --- lisp/cedet/srecode/getset.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/getset.el 2011-11-11 23:17:16 +0000 @@ -215,7 +215,7 @@ (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)))) === modified file 'lisp/ezimage.el' --- lisp/ezimage.el 2011-04-19 13:44:55 +0000 +++ lisp/ezimage.el 2011-11-11 23:17:16 +0000 @@ -257,9 +257,9 @@ (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 === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2011-10-26 14:07:31 +0000 +++ lisp/org/ChangeLog 2011-11-11 23:17:16 +0000 @@ -1,3 +1,7 @@ +2011-11-11 Juanma Barranquero + + * org-plot.el (org-plot/gnuplot-to-grid-data): Fix typo in docstring. + 2011-09-27 Eli Zaretskii * org.el (org-mode): Force left-to-right paragraphs in Org === modified file 'lisp/org/org-list.el' --- lisp/org/org-list.el 2011-08-18 20:41:06 +0000 +++ lisp/org/org-list.el 2011-11-11 23:17:16 +0000 @@ -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) === modified file 'lisp/org/org-plot.el' --- lisp/org/org-plot.el 2011-08-18 20:41:06 +0000 +++ lisp/org/org-plot.el 2011-11-11 23:17:16 +0000 @@ -136,7 +136,7 @@ "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) === modified file 'lisp/progmodes/idlw-shell.el' --- lisp/progmodes/idlw-shell.el 2011-10-20 00:26:14 +0000 +++ lisp/progmodes/idlw-shell.el 2011-11-11 23:17:16 +0000 @@ -959,7 +959,7 @@ ;; 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 @@ (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)) === modified file 'lisp/textmodes/sgml-mode.el' --- lisp/textmodes/sgml-mode.el 2011-10-20 00:26:14 +0000 +++ lisp/textmodes/sgml-mode.el 2011-11-11 23:17:16 +0000 @@ -1872,7 +1872,7 @@ ("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") === modified file 'nt/README.W32' --- nt/README.W32 2011-10-28 15:03:13 +0000 +++ nt/README.W32 2011-11-11 23:17:16 +0000 @@ -142,7 +142,7 @@ 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 === modified file 'src/ChangeLog.11' --- src/ChangeLog.11 2011-09-28 00:59:28 +0000 +++ src/ChangeLog.11 2011-11-11 23:17:16 +0000 @@ -7949,7 +7949,7 @@ 2010-05-11 Karel Klíč * 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 @@ -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 @@ -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]: === modified file 'src/ChangeLog.8' --- src/ChangeLog.8 2011-02-28 01:07:29 +0000 +++ src/ChangeLog.8 2011-11-11 23:17:16 +0000 @@ -13404,7 +13404,7 @@ 1998-10-20 Jason Rumney - * 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) === modified file 'src/s/hpux10-20.h' --- src/s/hpux10-20.h 2011-02-16 01:35:20 +0000 +++ src/s/hpux10-20.h 2011-11-11 23:17:16 +0000 @@ -89,7 +89,7 @@ #undef HAVE_RANDOM -/* Rainer Malzbender says definining +/* Rainer Malzbender says defining HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20 using GCC. */ #ifndef HAVE_XRMSETDATABASE #define HAVE_XRMSETDATABASE === modified file 'src/xfaces.c' --- src/xfaces.c 2011-09-09 01:06:52 +0000 +++ src/xfaces.c 2011-11-11 23:17:16 +0000 @@ -27,7 +27,7 @@ 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'. ------------------------------------------------------------ revno: 106352 fixes bug(s): http://debbugs.gnu.org/9999 committer: Jan D. branch nick: trunk timestamp: Fri 2011-11-11 19:33:30 +0100 message: * 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. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-11 09:18:32 +0000 +++ src/ChangeLog 2011-11-11 18:33:30 +0000 @@ -1,3 +1,10 @@ +2011-11-11 Jan Djärv + + * 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 * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. === modified file 'src/nsfns.m' --- src/nsfns.m 2011-11-05 12:25:01 +0000 +++ src/nsfns.m 2011-11-11 18:33:30 +0000 @@ -1057,7 +1057,7 @@ 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 ns_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); === modified file 'src/w32fns.c' --- src/w32fns.c 2011-11-05 16:25:16 +0000 +++ src/w32fns.c 2011-11-11 18:33:30 +0000 @@ -3986,7 +3986,7 @@ 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); === modified file 'src/xfns.c' --- src/xfns.c 2011-11-05 12:04:34 +0000 +++ src/xfns.c 2011-11-11 18:33:30 +0000 @@ -2929,7 +2929,7 @@ 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); ------------------------------------------------------------ revno: 106351 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2011-11-11 10:55:24 -0500 message: * lisp/electric.el: Make electric-indent-mode better behaved. * lisp/electric.el (electric-indent-post-self-insert-function): Make it possible for a char to only indent in some circumstances. (electric-indent-mode): Simplify. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-11 10:23:23 +0000 +++ lisp/ChangeLog 2011-11-11 15:55:24 +0000 @@ -1,3 +1,9 @@ +2011-11-11 Stefan Monnier + + * 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 * window.el (windows-with-parameter): Remove unused function. === modified file 'lisp/electric.el' --- lisp/electric.el 2011-11-09 15:10:25 +0000 +++ lisp/electric.el 2011-11-11 15:55:24 +0000 @@ -197,7 +197,11 @@ ;; 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 @@ ;; 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 @@ :group 'electricity (if electric-indent-mode (add-hook 'post-self-insert-hook - #'electric-indent-post-self-insert-function) - (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 + ;; 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))) ;; Electric pairing. ------------------------------------------------------------ revno: 106350 committer: martin rudalics branch nick: trunk timestamp: Fri 2011-11-11 11:23:23 +0100 message: Further rename and clean up of functions in window.el. * window.el (window-size-ignore, window-size-fixed-1) (window-in-direction-2): Prefix with "window--". (window-tree-1): Rename to window--subtree, fix doc-string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-11 09:59:00 +0000 +++ lisp/ChangeLog 2011-11-11 10:23:23 +0000 @@ -3,7 +3,9 @@ * 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): Prefix with "window--". + (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 === modified file 'lisp/window.el' --- lisp/window.el 2011-11-11 09:59:00 +0000 +++ lisp/window.el 2011-11-11 10:23:23 +0000 @@ -508,7 +508,7 @@ window).") (make-variable-buffer-local 'window-size-fixed) -(defun 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-valid-p ignore) (eq window ignore) ignore)) @@ -549,7 +549,7 @@ 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)) @@ -578,7 +578,7 @@ (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)))) @@ -588,7 +588,7 @@ (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)))))))) @@ -625,7 +625,7 @@ (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) @@ -642,7 +642,7 @@ (>= (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 @@ -653,7 +653,7 @@ ;; windows are fixed-size. (progn (while sub - (unless (window-size-fixed-1 sub horizontal) + (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)) @@ -664,7 +664,7 @@ ;; An ortho-combination is fixed-size if at least one of its ;; child windows is fixed-size. (while sub - (when (window-size-fixed-1 sub horizontal) + (when (window--size-fixed-1 sub horizontal) ;; We found a fixed-size child window, so WINDOW's size ;; is fixed. (throw 'fixed t)) @@ -684,7 +684,7 @@ If this function returns nil, this does not necessarily mean that WINDOW can be resized in the desired direction. The function `window-resizable' can tell that." - (window-size-fixed-1 + (window--size-fixed-1 (window-normalize-window window) horizontal)) (defun window-min-delta-1 (window delta &optional horizontal ignore trail noup) @@ -706,7 +706,7 @@ ((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 child window. @@ -795,7 +795,7 @@ ;; 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)))) @@ -834,7 +834,7 @@ 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)) + (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. @@ -1098,7 +1098,7 @@ 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))) @@ -1168,7 +1168,7 @@ ;; 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) @@ -1193,7 +1193,7 @@ (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) @@ -1822,7 +1822,7 @@ ;; 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. @@ -2154,9 +2154,9 @@ "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 @@ -2168,10 +2168,10 @@ (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)))) @@ -2193,7 +2193,7 @@ 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. ------------------------------------------------------------ revno: 106349 committer: Paul Eggert branch nick: trunk timestamp: Fri 2011-11-11 02:04:08 -0800 message: Spelling fixes. diff: === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2011-07-10 02:38:26 +0000 +++ doc/emacs/ack.texi 2011-11-11 10:04:08 +0000 @@ -99,7 +99,7 @@ @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 @@ -576,7 +576,7 @@ @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 === modified file 'etc/NEWS.20' --- etc/NEWS.20 2011-01-25 04:08:28 +0000 +++ etc/NEWS.20 2011-11-11 10:04:08 +0000 @@ -2047,7 +2047,7 @@ 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'. === modified file 'lisp/cedet/cedet.el' --- lisp/cedet/cedet.el 2011-01-26 08:36:39 +0000 +++ lisp/cedet/cedet.el 2011-11-11 10:04:08 +0000 @@ -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. === modified file 'lisp/cedet/ede/proj-elisp.el' --- lisp/cedet/ede/proj-elisp.el 2011-04-23 03:07:16 +0000 +++ lisp/cedet/ede/proj-elisp.el 2011-11-11 10:04:08 +0000 @@ -217,7 +217,7 @@ (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")))) === modified file 'lisp/cedet/semantic/edit.el' --- lisp/cedet/semantic/edit.el 2011-02-28 01:07:29 +0000 +++ lisp/cedet/semantic/edit.el 2011-11-11 10:04:08 +0000 @@ -427,7 +427,7 @@ ;; 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 === modified file 'lisp/cedet/srecode/extract.el' --- lisp/cedet/srecode/extract.el 2011-01-25 04:08:28 +0000 +++ lisp/cedet/srecode/extract.el 2011-11-11 10:04:08 +0000 @@ -66,7 +66,7 @@ (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 === modified file 'lisp/dframe.el' --- lisp/dframe.el 2011-04-19 13:44:55 +0000 +++ lisp/dframe.el 2011-11-11 10:04:08 +0000 @@ -523,7 +523,7 @@ (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) === modified file 'lisp/font-lock.el' --- lisp/font-lock.el 2011-10-17 22:21:48 +0000 +++ lisp/font-lock.el 2011-11-11 10:04:08 +0000 @@ -1742,7 +1742,7 @@ 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) === modified file 'lisp/progmodes/gud.el' --- lisp/progmodes/gud.el 2011-11-09 16:18:33 +0000 +++ lisp/progmodes/gud.el 2011-11-11 10:04:08 +0000 @@ -2016,7 +2016,7 @@ ((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) === modified file 'lisp/progmodes/idlwave.el' --- lisp/progmodes/idlwave.el 2011-10-21 14:48:39 +0000 +++ lisp/progmodes/idlwave.el 2011-11-11 10:04:08 +0000 @@ -8961,7 +8961,7 @@ (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)) === modified file 'lisp/progmodes/pascal.el' --- lisp/progmodes/pascal.el 2011-06-20 16:02:31 +0000 +++ lisp/progmodes/pascal.el 2011-11-11 10:04:08 +0000 @@ -227,7 +227,7 @@ :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) === modified file 'lisp/ses.el' --- lisp/ses.el 2011-06-30 02:51:27 +0000 +++ lisp/ses.el 2011-11-11 10:04:08 +0000 @@ -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 === modified file 'src/keyboard.c' --- src/keyboard.c 2011-11-06 19:42:14 +0000 +++ src/keyboard.c 2011-11-11 10:04:08 +0000 @@ -8133,7 +8133,7 @@ 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. */ === modified file 'src/w32font.c' --- src/w32font.c 2011-11-05 18:50:59 +0000 +++ src/w32font.c 2011-11-11 10:04:08 +0000 @@ -2221,7 +2221,7 @@ 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); @@ -2311,7 +2311,7 @@ /* 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 ------------------------------------------------------------ revno: 106348 committer: martin rudalics branch nick: trunk timestamp: Fri 2011-11-11 10:59:00 +0100 message: Rename and clean up functions in window.el. * 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): Prefix with "window--". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-11 01:46:03 +0000 +++ lisp/ChangeLog 2011-11-11 09:59:00 +0000 @@ -1,3 +1,10 @@ +2011-11-11 Martin Rudalics + + * 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): Prefix with "window--". + 2011-11-11 Glenn Morris * subr.el (eval-after-load): If FILE is already loaded, === modified file 'lisp/window.el' --- lisp/window.el 2011-11-09 09:36:05 +0000 +++ lisp/window.el 2011-11-11 09:59:00 +0000 @@ -292,28 +292,6 @@ (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 @@ -353,8 +331,8 @@ 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 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 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))) + (window--atom-check-1 (frame-root-window frame))) ;; Side windows. (defvar window-sides '(left top right bottom) @@ -441,7 +419,7 @@ (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 @@ (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 @@ -1106,7 +1084,7 @@ (= (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 @@ -2379,7 +2357,7 @@ (function (window-parameter window 'delete-window)) (parent (window-parent window)) atom-root) - (window-check frame) + (window--check frame) (catch 'done ;; Handle window parameters. (cond @@ -2433,7 +2411,7 @@ ;; 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)))) @@ -2460,7 +2438,7 @@ (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 @@ -2484,7 +2462,7 @@ (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))) @@ -3111,7 +3089,7 @@ (window-nest window-nest) atom-root) - (window-check frame) + (window--check frame) (catch 'done (cond ;; Ignore window parameters if either `ignore-window-parameters' @@ -3265,7 +3243,7 @@ (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))))) @@ -3885,7 +3863,7 @@ (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'. ------------------------------------------------------------ revno: 106347 author: Dmitry Antipov committer: Paul Eggert branch nick: trunk timestamp: Fri 2011-11-11 01:18:32 -0800 message: * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-11 08:09:40 +0000 +++ src/ChangeLog 2011-11-11 09:18:32 +0000 @@ -1,3 +1,7 @@ +2011-11-11 Dmitry Antipov + + * xdisp.c (syms_of_xdisp): Remove duplicated definition of Qtext. + 2011-11-11 Kenichi Handa * callproc.c (Fcall_process): Set the member dst_multibyte of === modified file 'src/xdisp.c' --- src/xdisp.c 2011-11-11 07:08:47 +0000 +++ src/xdisp.c 2011-11-11 09:18:32 +0000 @@ -27974,7 +27974,6 @@ 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"), ------------------------------------------------------------ revno: 106346 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Fri 2011-11-11 17:10:35 +0900 message: callproc.c (Fcall_process): Set the member dst_multibyte of process_coding. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-11 07:08:47 +0000 +++ src/ChangeLog 2011-11-11 08:09:40 +0000 @@ -1,3 +1,8 @@ +2011-11-11 Kenichi Handa + + * callproc.c (Fcall_process): Set the member dst_multibyte of + process_coding. + 2011-11-11 Johan Bockgård * xdisp.c (fill_composite_glyph_string): Always set s->face, to === modified file 'src/callproc.c' --- src/callproc.c 2011-11-07 01:57:07 +0000 +++ src/callproc.c 2011-11-11 08:09:40 +0000 @@ -712,6 +712,7 @@ /* 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 { @@ -747,6 +748,8 @@ && !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; ------------------------------------------------------------ revno: 106345 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Fri 2011-11-11 16:09:14 +0900 message: xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-09 14:29:23 +0000 +++ src/ChangeLog 2011-11-11 07:08:47 +0000 @@ -1,3 +1,8 @@ +2011-11-11 Johan Bockgård + + * xdisp.c (fill_composite_glyph_string): Always set s->face, to + avoid a crash (bug#9496). + 2011-11-09 Chong Yidong * window.c (Fwindow_inside_edges, Fwindow_inside_pixel_edges) === modified file 'src/xdisp.c' --- src/xdisp.c 2011-11-08 20:05:27 +0000 +++ src/xdisp.c 2011-11-11 07:08:47 +0000 @@ -22121,6 +22121,12 @@ } 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; ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.