Now on revision 109087. ------------------------------------------------------------ revno: 109087 fixes bug(s): http://debbugs.gnu.org/11520 committer: Chong Yidong branch nick: trunk timestamp: Sat 2012-07-14 13:32:23 +0800 message: Fix electric-pair-mode/delete-selection-mode interaction. * lisp/electric.el (electric-pair-post-self-insert-function): Fix pair insertion in empty-region case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-14 02:19:07 +0000 +++ lisp/ChangeLog 2012-07-14 05:32:23 +0000 @@ -1,5 +1,10 @@ 2012-07-14 Chong Yidong + * electric.el (electric-pair-post-self-insert-function): Fix pair + insertion in empty-region case (Bug#11520). + +2012-07-14 Chong Yidong + * bindings.el: Consolidate ctl-x-r-map bindings. Bind copy-rectangle-as-kill to C-x r w. === modified file 'lisp/electric.el' --- lisp/electric.el 2012-07-10 11:51:54 +0000 +++ lisp/electric.el 2012-07-14 05:32:23 +0000 @@ -322,12 +322,13 @@ ((and (memq syntax '(?\( ?\" ?\$)) (use-region-p)) (if (> (mark) (point)) (goto-char (mark)) - ;; We already inserted the open-paren but at the end of the region, - ;; so we have to remove it and start over. - (delete-char -1) - (save-excursion + ;; We already inserted the open-paren but at the end of the + ;; region, so we have to remove it and start over. + (delete-char -1) + (save-excursion (goto-char (mark)) - (insert last-command-event))) + ;; Do not insert after `save-excursion' marker (Bug#11520). + (insert-before-markers last-command-event))) (insert closer)) ;; Backslash-escaped: no pairing, no skipping. ((save-excursion ------------------------------------------------------------ revno: 109086 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2012-07-14 04:26:31 +0200 message: * nt/config.nt: Sync with autogen/config.in. (GC_MARK_SECONDARY_STACK, GC_MARK_STACK, GC_SETJMP_WORKS) (SETUP_SLAVE_PTY): New macros. * src/s/ms-w32.h (GC_SETJMP_WORKS, GC_MARK_STACK): Set in nt/config.nt. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-07-14 02:08:32 +0000 +++ nt/ChangeLog 2012-07-14 02:26:31 +0000 @@ -1,3 +1,9 @@ +2012-07-14 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (GC_MARK_SECONDARY_STACK, GC_MARK_STACK, GC_SETJMP_WORKS) + (SETUP_SLAVE_PTY): New macros. + 2012-07-13 Juanma Barranquero * config.nt: Sync with autogen/config.in. === modified file 'nt/config.nt' --- nt/config.nt 2012-07-13 11:49:26 +0000 +++ nt/config.nt 2012-07-14 02:26:31 +0000 @@ -160,6 +160,19 @@ /* Define this to check for short string overrun. */ #undef GC_CHECK_STRING_OVERRUN +/* Mark a secondary stack, like the register stack on the ia64. */ +#undef GC_MARK_SECONDARY_STACK + +/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not + known to work. */ +#define GC_MARK_STACK 1 + +/* Define if setjmp is known to save all registers relevant for conservative + garbage collection in the jmp_buf. + MSVC ignores the "register" keyword, so test fails even though + setjmp does work. */ +#define GC_SETJMP_WORKS 1 + /* Define to 1 if the `getpgrp' function requires zero arguments. */ #undef GETPGRP_VOID @@ -1238,6 +1251,9 @@ /* Define if process.c:child_setup should not call setpgrp. */ #undef SETPGRP_RELEASES_CTTY +/* How to set up a slave PTY, if needed. */ +#undef SETUP_SLAVE_PTY + /* Make process_send_signal work by "typing" a signal character on the pty. */ #undef SIGNALS_VIA_CHARACTERS @@ -1668,15 +1684,6 @@ #undef noinline #endif -/* These won't be used automatically yet. We also need to know, at least, - that the stack is continuous. */ -#ifdef __GNUC__ -# ifndef GC_SETJMP_WORKS - /* GC_SETJMP_WORKS is nearly always appropriate for GCC. */ -# define GC_SETJMP_WORKS 1 -# endif -#endif - #endif /* EMACS_CONFIG_H */ /* === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-14 02:08:32 +0000 +++ src/ChangeLog 2012-07-14 02:26:31 +0000 @@ -1,3 +1,7 @@ +2012-07-14 Juanma Barranquero + + * s/ms-w32.h (GC_SETJMP_WORKS, GC_MARK_STACK): Set in nt/config.nt. + 2012-07-14 Glenn Morris * s/aix4-2.h, s/freebsd.h, s/gnu-linux.h, s/hpux10-20.h: === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2012-07-13 11:49:26 +0000 +++ src/s/ms-w32.h 2012-07-14 02:26:31 +0000 @@ -50,13 +50,6 @@ for received packets, so datagrams are broken too. */ #define BROKEN_DATAGRAM_SOCKETS 1 -/* MSVC ignores the "register" keyword, so test fails even though - setjmp does work. */ -#define GC_SETJMP_WORKS 1 - -/* Enable conservative stack marking for GC. */ -#define GC_MARK_STACK 1 - #define MAIL_USE_SYSTEM_LOCK 1 /* If the character used to separate elements of the executable path ------------------------------------------------------------ revno: 109085 fixes bug(s): http://debbugs.gnu.org/739 author: Reuben Thomas committer: Chong Yidong branch nick: trunk timestamp: Sat 2012-07-14 10:19:07 +0800 message: * rect.el (copy-rectangle-as-kill): New command. * lisp/rect.el, lisp/register.el: Move bindings to bindings.el. * lisp/bindings.el: Consolidate ctl-x-r-map bindings. Bind copy-rectangle-as-kill to C-x r w. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-07-13 07:06:09 +0000 +++ etc/NEWS 2012-07-14 02:19:07 +0000 @@ -158,6 +158,9 @@ ** `goto-char' is now bound to `M-g c'. +** New command `C-x r M-w' (copy-rectangle-as-kill). +It copies the region-rectangle as the last rectangle kill. + ** New input method `vietnamese-vni'. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-14 02:08:32 +0000 +++ lisp/ChangeLog 2012-07-14 02:19:07 +0000 @@ -1,3 +1,14 @@ +2012-07-14 Chong Yidong + + * bindings.el: Consolidate ctl-x-r-map bindings. Bind + copy-rectangle-as-kill to C-x r w. + + * rect.el, register.el: Move bindings to bindings.el. + +2012-07-14 Reuben Thomas + + * rect.el (copy-rectangle-as-kill): New command (Bug#739). + 2012-07-13 Andreas Schwab * emacs-lisp/cl.el (labels): Remove spurious quote. (Bug#11938) === modified file 'lisp/bindings.el' --- lisp/bindings.el 2012-07-13 17:02:18 +0000 +++ lisp/bindings.el 2012-07-14 02:19:07 +0000 @@ -1183,7 +1183,30 @@ (define-key ctl-x-5-map "m" 'compose-mail-other-frame) -(defvar ctl-x-r-map (make-sparse-keymap) +(defvar ctl-x-r-map + (let ((map (make-sparse-keymap))) + (define-key map "c" 'clear-rectangle) + (define-key map "k" 'kill-rectangle) + (define-key map "d" 'delete-rectangle) + (define-key map "y" 'yank-rectangle) + (define-key map "o" 'open-rectangle) + (define-key map "t" 'string-rectangle) + (define-key map "N" 'rectangle-number-lines) + (define-key map "\M-w" 'copy-rectangle-as-kill) + (define-key map "\C-@" 'point-to-register) + (define-key map [?\C-\ ] 'point-to-register) + (define-key map " " 'point-to-register) + (define-key map "j" 'jump-to-register) + (define-key map "s" 'copy-to-register) + (define-key map "x" 'copy-to-register) + (define-key map "i" 'insert-register) + (define-key map "g" 'insert-register) + (define-key map "r" 'copy-rectangle-to-register) + (define-key map "n" 'number-to-register) + (define-key map "+" 'increment-register) + (define-key map "w" 'window-configuration-to-register) + (define-key map "f" 'frame-configuration-to-register) + map) "Keymap for subcommands of C-x r.") (define-key ctl-x-map "r" ctl-x-r-map) === modified file 'lisp/rect.el' --- lisp/rect.el 2012-01-19 07:21:25 +0000 +++ lisp/rect.el 2012-07-14 02:19:07 +0000 @@ -29,16 +29,6 @@ ;; ### NOTE: this file was almost completely rewritten by Didier Verna ;; in July 1999. -;;; Global key bindings - -;;;###autoload (define-key ctl-x-r-map "c" 'clear-rectangle) -;;;###autoload (define-key ctl-x-r-map "k" 'kill-rectangle) -;;;###autoload (define-key ctl-x-r-map "d" 'delete-rectangle) -;;;###autoload (define-key ctl-x-r-map "y" 'yank-rectangle) -;;;###autoload (define-key ctl-x-r-map "o" 'open-rectangle) -;;;###autoload (define-key ctl-x-r-map "t" 'string-rectangle) -;;;###autoload (define-key ctl-x-r-map "N" 'rectangle-number-lines) - ;;; Code: ;; FIXME: this function should be replaced by `apply-on-rectangle' @@ -236,6 +226,13 @@ (signal 'text-read-only (list (current-buffer))))))) ;;;###autoload +(defun copy-rectangle-as-kill (start end) + "Copy the region-rectangle and save it as the last killed one." + (interactive "r") + (setq killed-rectangle (extract-rectangle start end)) + (setq deactivate-mark t)) + +;;;###autoload (defun yank-rectangle () "Yank the last killed rectangle with upper left corner at point." (interactive "*") === modified file 'lisp/register.el' --- lisp/register.el 2012-07-10 11:51:54 +0000 +++ lisp/register.el 2012-07-14 02:19:07 +0000 @@ -34,22 +34,6 @@ (declare-function semantic-tag-buffer "semantic/tag" (tag)) (declare-function semantic-tag-start "semantic/tag" (tag)) -;;; Global key bindings - -(define-key ctl-x-r-map "\C-@" 'point-to-register) -(define-key ctl-x-r-map [?\C-\ ] 'point-to-register) -(define-key ctl-x-r-map " " 'point-to-register) -(define-key ctl-x-r-map "j" 'jump-to-register) -(define-key ctl-x-r-map "s" 'copy-to-register) -(define-key ctl-x-r-map "x" 'copy-to-register) -(define-key ctl-x-r-map "i" 'insert-register) -(define-key ctl-x-r-map "g" 'insert-register) -(define-key ctl-x-r-map "r" 'copy-rectangle-to-register) -(define-key ctl-x-r-map "n" 'number-to-register) -(define-key ctl-x-r-map "+" 'increment-register) -(define-key ctl-x-r-map "w" 'window-configuration-to-register) -(define-key ctl-x-r-map "f" 'frame-configuration-to-register) - ;;; Code: (cl-defstruct ------------------------------------------------------------ revno: 109084 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2012-07-14 04:08:32 +0200 message: Fix typos in ChangeLogs. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-14 00:04:10 +0000 +++ ChangeLog 2012-07-14 02:08:32 +0000 @@ -291,7 +291,7 @@ * lib/stat-time.h: * lib/timespec.h: - * lib/utimens.h: Include sys/time.h + * lib/utimens.h: Include sys/time.h. 2012-06-23 Andreas Schwab @@ -5156,7 +5156,7 @@ 2004-10-08 Steven Tamm - * configure.in (HAVE_MALLOC_MALLOC_H): Test for malloc/malloc.h + * configure.in (HAVE_MALLOC_MALLOC_H): Test for malloc/malloc.h. 2004-10-06 Jan Djärv @@ -8003,7 +8003,7 @@ 1995-09-30 Richard Stallman - * configure.in (powerpc-*-solaris2): New alternative.x + * configure.in (powerpc-*-solaris2): New alternative. 1995-09-12 Karl Heuer @@ -8521,7 +8521,7 @@ 1994-09-20 Richard Stallman - * Makefile.in (paths-force): Depend on src/paths.h + * Makefile.in (paths-force): Depend on src/paths.h. 1994-09-19 Karl Heuer @@ -9362,7 +9362,7 @@ 1993-09-12 Roland McGrath (roland@sugar-bombs.gnu.ai.mit.edu) - * make-dist: Dist vpath.sed + * make-dist: Dist vpath.sed. * Makefile.in (lib-src/Makefile, src/Makefile, oldXMenu/Makefile): Depend on vpath.sed. === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-07-11 07:05:21 +0000 +++ admin/ChangeLog 2012-07-14 02:08:32 +0000 @@ -631,7 +631,7 @@ 2009-02-23 Jason Rumney - * nt/README-ftp-server: Update for 23.0.91 + * nt/README-ftp-server: Update for 23.0.91. * nt/README.W32: Remove ever expanding versions of Windows. Shorten FAQ URL. Remove mention of obsolete lock directory. === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-07-13 14:25:59 +0000 +++ doc/emacs/ChangeLog 2012-07-14 02:08:32 +0000 @@ -1308,7 +1308,6 @@ * custom.texi (Mouse Buttons): * rmail.texi (Rmail Scrolling): * search.texi (Isearch Scroll): - * display.texi (Scrolling): Replace scroll-up/down with scroll-up/down-command. Fix scroll-preserve-screen-position description. Document scroll-error-top-bottom. @@ -3127,9 +3126,9 @@ * ack.texi (Acknowledgments): General update based on AUTHORS, including removal of some stuff no longer distributed. -2008-12-19 Agustin Martin +2008-12-19 Agustín Martín - * fixit.texi: Mention hunspell + * fixit.texi: Mention hunspell. 2008-12-19 Glenn Morris === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2012-06-21 07:34:27 +0000 +++ doc/lispintro/ChangeLog 2012-07-14 02:08:32 +0000 @@ -389,7 +389,7 @@ `named' to `selected'. (lengths-list-file): Remove extraneous parenthesis from reference. (lengths-list-many-files): Explain `expand-file-name' better. - (Files List): Rephrase sentence regarding Lisp sources directory + (Files List): Rephrase sentence regarding Lisp sources directory. 2006-11-04 Robert J. Chassell === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-07-13 07:06:09 +0000 +++ doc/lispref/ChangeLog 2012-07-14 02:08:32 +0000 @@ -10916,8 +10916,8 @@ (Recording Input): Document that clear-this-command-keys clears the vector to be returned by recent-keys. - * keymaps.texi (Scanning Keymaps) : The - argument keymap can be a list. + * keymaps.texi (Scanning Keymaps) : + The argument keymap can be a list. * nonascii.texi (User-Chosen Coding Systems) : Document the new argument @@ -11162,7 +11162,7 @@ * Makefile (dist): Don't bother excluding autosave files; they'll never make it into the temp directory anyway, and the hash marks in the name are problematic for make and the Bourne shell. - (srcs): + (srcs): ??? 1993-02-12 Jim Blandy (jimb@wookumz.gnu.ai.mit.edu) === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-07-09 04:52:49 +0000 +++ doc/misc/ChangeLog 2012-07-14 02:08:32 +0000 @@ -832,7 +832,7 @@ 2011-08-15 Eric Schulte * org.texi (Structure of code blocks): Explicitly state that the - behavior of multiple blocks of the same name is undefined + behavior of multiple blocks of the same name is undefined. 2011-08-15 Christian Egli @@ -1199,7 +1199,7 @@ 2011-03-19 Antoine Levitt - * gnus.texi (Listing Groups): Document gnus-group-list-ticked + * gnus.texi (Listing Groups): Document gnus-group-list-ticked. 2011-03-17 Jay Belanger @@ -3124,7 +3124,7 @@ 2009-07-29 Jay Belanger * calc.texi (Stack Manipulation Commands): Add documentation for - `calc-transpose-lines' + `calc-transpose-lines'. 2009-07-27 Michael Albinus === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-07-08 00:48:27 +0000 +++ etc/ChangeLog 2012-07-14 02:08:32 +0000 @@ -993,7 +993,7 @@ 2009-09-27 Teodor Zlatanov - * NEWS: Mention new library imap-hash.el + * NEWS: Mention new library imap-hash.el. 2009-09-22 Juanma Barranquero @@ -1037,7 +1037,7 @@ 2009-08-08 Dmitry Dzhus * images/gud/all.xpm, images/gud/thread.xpm: New icons for - gdb-mi.el + gdb-mi.el. 2009-08-07 Dan Nicolaescu @@ -2073,7 +2073,7 @@ 2007-07-02 Carsten Dominik - * orgcard.tex: Version 5.01 + * orgcard.tex: Version 5.01. 2007-06-27 Michael Albinus @@ -2641,7 +2641,7 @@ 2006-09-15 Richard Stallman * THE-GNU-PROJECT: Update with the latest footnotes - from www.gnu.org/gnu/the-gnu-project.html + from www.gnu.org/gnu/the-gnu-project.html. 2006-09-15 David Kastrup @@ -3267,7 +3267,7 @@ 2005-11-18 Carsten Dominik - * orgcard.tex: Version 3.20 + * orgcard.tex: Version 3.20. 2005-11-16 Nick Roberts @@ -5018,7 +5018,7 @@ 1993-03-19 Eric S. Raymond (eric@geech.gnu.ai.mit.edu) - * sex.6: Added 900-line support + * sex.6: Added 900-line support. * NEWS: Added news about the package finder. @@ -5557,7 +5557,7 @@ 1988-12-31 Richard Mlynarik (mly@rice-chex.ai.mit.edu) * env.c: Add decl for my-index. - * etags.c (file-entries): .oak => scheme + * etags.c (file-entries): .oak => scheme. 1988-12-30 Richard Stallman (rms@sugar-bombs.ai.mit.edu) === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-13 18:15:22 +0000 +++ lisp/ChangeLog 2012-07-14 02:08:32 +0000 @@ -1738,7 +1738,7 @@ 2012-06-05 Sam Steingold - * calendar/calendar.el (calendar-exit): reinstate the 2012-03-28 + * calendar/calendar.el (calendar-exit): Reinstate the 2012-03-28 patch (Bug#11140). 2012-06-05 Stefan Monnier @@ -3603,7 +3603,7 @@ * textmodes/ispell.el (ispell-buffer-session-localwords): New buffer-local variable to hold buffer session localwords. - (ispell-kill-ispell): add option 'clear to delete session + (ispell-kill-ispell): Add option 'clear to delete session localwords. (ispell-command-loop, ispell-change-dictionary) (ispell-buffer-local-words): Preserve session localwords when === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2012-07-09 22:30:01 +0000 +++ lisp/cedet/ChangeLog 2012-07-14 02:08:32 +0000 @@ -946,6 +946,7 @@ (srecode-template-inserter-ask, srecode-template-inserter-width) (srecode-template-inserter-section-start) (srecode-template-inserter-section-end, srecode-insert-method): + Fix typos in docstrings. 2010-01-12 Juanma Barranquero === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-07-13 07:06:09 +0000 +++ lisp/gnus/ChangeLog 2012-07-14 02:08:32 +0000 @@ -4731,7 +4731,7 @@ 2010-11-29 Binjo (tiny change) * nnimap.el (nnimap-open-connection-1): w32 open-network-stream doesn't - seem to accept strings-with-numbers as port numbers, + seem to accept strings-with-numbers as port numbers. 2010-11-29 Andrew Cohen @@ -4930,7 +4930,7 @@ 2010-11-25 Julien Danjou - * shr-color.el (shr-color->hexadecimal): Use color-rgb->hex + * shr-color.el (shr-color->hexadecimal): Use color-rgb->hex. * color.el: Rename from color-lab.el (color-rgb->hex): Add. @@ -20992,8 +20992,8 @@ 2004-05-20 Danny Siu - * gnus-sum.el (gnus-summary-recenter): Summery buffer was not auto - centered even when gnus-auto-center-summary is t + * gnus-sum.el (gnus-summary-recenter): Summary buffer was not auto + centered even when gnus-auto-center-summary is t. 2004-05-22 Lars Magne Ingebrigtsen @@ -22215,7 +22215,7 @@ * gnus.el (gnus-method-to-server): Move defsubst before first use. - * gnus-diary.el (gnus-diary-header-schedule): caddr -> car (cddr + * gnus-diary.el (gnus-diary-header-schedule): caddr -> car (cddr. * gnus-art.el (gnus-article-edit-mode): Define before first reference. @@ -22447,7 +22447,7 @@ * gnus-sum.el (gnus-select-newgroup): Replace inline code with gnus-agent-possibly-alter-active. - (gnus-adjust-marked-articles): Faster handling of simple lists + (gnus-adjust-marked-articles): Faster handling of simple lists. 2004-01-21 Jesper Harder === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2012-07-02 08:00:05 +0000 +++ lisp/org/ChangeLog 2012-07-14 02:08:32 +0000 @@ -4,7 +4,7 @@ (org-clock-modeline-total, org-clock-task-overrun-text) (org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line". -2012-05-27 Mark Shoulson (tiny change) +2012-05-27 Mark Shoulson (tiny change) * org.el (org-fontify-entities): Fix bug: The entities \sup[123] and \there4 were not "prettified" when org-pretty-entities was enabled. @@ -362,7 +362,7 @@ 2012-04-01 Ilya Shlyakhter (tiny change) * org-colview.el (org-columns-cleanup-item): Handle case of empty - headline + headline. 2012-04-01 Nicolas Goaziou @@ -400,7 +400,7 @@ 2012-04-01 Ilya Shlyakhter - * org-clock.el: (org-clock-get-table-data): Make sure todo-only + * org-clock.el (org-clock-get-table-data): Make sure todo-only does not leak when it is set by make-org-tags-macher. 2012-04-01 Bastien Guerry @@ -688,7 +688,7 @@ 2012-04-01 Bernt Hansen * org.el (org-clone-subtree-with-time-shift): Fix task cloning for - repeating tasks using .+n and ++n syntax + repeating tasks using .+n and ++n syntax. 2012-04-01 Karl Fogel (tiny change) @@ -863,7 +863,7 @@ 2012-04-01 Toby S. Cubitt (tiny change) - * org.el (org-goto): call org-refile-get-location with NO-EXCLUDE + * org.el (org-goto): Call org-refile-get-location with NO-EXCLUDE argument set, otherwise not only are headlines in the current subtree excluded, but it throws an error if point happens not to be within a subtree (e.g. at start of buffer). @@ -877,7 +877,7 @@ * org-clock.el (org-in-clocktable-p): Moved to org.el. * org.el (org-in-clocktable-p): New function. Moved from - org-clock.el + org-clock.el. 2012-04-01 David Maus @@ -1011,7 +1011,7 @@ 2012-04-01 Toby S. Cubitt (tiny change) - * org.el (org-goto): call org-refile-get-location with NO-EXCLUDE + * org.el (org-goto): Call org-refile-get-location with NO-EXCLUDE argument set, otherwise not only are headlines in the current subtree excluded, but it throws an error if point happens not to be within a subtree (e.g. at start of buffer). @@ -1031,7 +1031,7 @@ 2012-04-01 Bernt Hansen * org-clock.el (org-clock-out): Do not delete the current clocking - task when org-clock-out-hook clocks in another task + task when org-clock-out-hook clocks in another task. 2012-04-01 David Maus @@ -1052,7 +1052,7 @@ * org-clock.el (org-in-clocktable-p): Moved to org.el. - * org.el (org-in-clocktable-p): New function. Moved from org-clock.el + * org.el (org-in-clocktable-p): New function. Moved from org-clock.el. 2012-04-01 David Maus @@ -1389,7 +1389,7 @@ 2012-04-01 Jambunathan K * org-odt.el (org-odt-label-styles): Add a new style. - (org-odt-category-map-alist): Use it. + (org-odt-category-map-alist): Use it. 2012-04-01 Jambunathan K @@ -1573,16 +1573,17 @@ 2012-04-01 Bernt Hansen - * org-agenda.el (org-agenda-switch-to): Widen org buffer only if point is - outside the current restriction - -2012-04-01 Bernt Hansen - - * org-agenda.el (org-agenda-clock-in): Save restriction when clocking in from the agenda - -2012-04-01 Bernt Hansen - - * org.el: Honour existing restrictions when regenerating the agenda + * org-agenda.el (org-agenda-switch-to): Widen org buffer only if point + is outside the current restriction. + +2012-04-01 Bernt Hansen + + * org-agenda.el (org-agenda-clock-in): Save restriction when clocking + in from the agenda. + +2012-04-01 Bernt Hansen + + * org.el: Honour existing restrictions when regenerating the agenda. 2012-04-01 Bastien Guerry @@ -1611,8 +1612,8 @@ 2012-04-01 Martyn Jago * ob-emacs-lisp.el: A comment on the last line of an emacs-lisp - code block would cause an error when the block is was executed. This - fix cures this behaviour. + code block would cause an error when the block is was executed. + This fix cures this behaviour. 2012-04-01 Eric Schulte @@ -2018,7 +2019,7 @@ 2012-01-03 Litvinov Sergey - * ob-octave.el: add graphical output to png file + * ob-octave.el: Add graphical output to png file. 2012-01-03 Eric Schulte @@ -2107,7 +2108,7 @@ 2012-01-03 Michael Brand - * org.el (Key bindings): remap the Outline functions from + * org.el (Key bindings): Remap the Outline functions from `outline-mode-prefix-map' where possible. 2012-01-03 Christian Moe (tiny change) @@ -2186,7 +2187,7 @@ * org-special-blocks.el (org-special-blocks-convert-html-special-cookies): Close paragraph before opening or closing the
, and open - paragraph after. Also changed newline placement to be the same + paragraph after. Also changed newline placement to be the same as for other blocks. 2012-01-03 Roberto Huelga @@ -3344,9 +3345,9 @@ * ob-asymptote.el (org-babel-asymptote-table-to-array): Require a new argument TYPE specifying the detected type of array. If it's a string array, make sure every element is - returned as a string. Also improve doc-string. - (org-babel-asymptote-var-to-asymptote): Fill new argument. Small - refactoring. + returned as a string. Also improve doc-string. + (org-babel-asymptote-var-to-asymptote): Fill new argument. + Small refactoring. (org-babel-asymptote-define-type): Rewrite to avoid stopping search at first float found, as strings have precedence over floats. @@ -3376,7 +3377,7 @@ * org-footnote.el (org-footnote-get-definition): The function has to widen buffer if definition has not been found in the current - narrowed part. Be sure to restore that restriction once the + narrowed part. Be sure to restore that restriction once the definition is found. 2012-01-03 Michal Sojka (tiny change) @@ -3419,7 +3420,7 @@ 2012-01-03 Suvayu Ali (tiny change) * org-inlinetask.el (org-inlinetask): New customizable face - for inlinetasks + for inlinetasks. 2012-01-03 Bastien Guerry @@ -3518,7 +3519,7 @@ (org-indent-agent-resume-delay): Change value. (org-indent-initialize-buffer): Change argument name. (org-indent-add-properties): Change argument name and type - expected. It must be a time value now. + expected. It must be a time value now. 2012-01-03 Bastien Guerry @@ -3573,8 +3574,8 @@ (org-indent-initialize-agent): New function. (org-indent-initialize-buffer): Now requires a mandatory buffer argument. - (org-indent-add-properties): Reflect changes to variables. The resume - timer is now global. + (org-indent-add-properties): Reflect changes to variables. + The resume timer is now global. 2012-01-03 Nicolas Goaziou @@ -3620,7 +3621,7 @@ * org-indent.el (org-indent-modified-headline-flag): Renamed from `org-indent-deleted-headline-flag' (org-indent-notify-modified-headline): Renamed from - `org-indent-notify-deleted-headline'. Handle situations when + `org-indent-notify-deleted-headline'. Handle situations when the stars of an headline are modified. (org-indent-refresh-maybe): Remove case now handled by previous function. @@ -3643,7 +3644,7 @@ (org-indent-initial-timer, org-indent-initial-lock): New variables. (org-indent-mode): At initialization, start an idle timer to indent - the whole buffer. When the user is asking for control, interrupt the + the whole buffer. When the user is asking for control, interrupt the process, and resume at the same point when idle again. (org-indent-initialize-buffer): New function. (org-indent-add-properties): Throw an interrupt when indentation of @@ -3690,7 +3691,7 @@ 2012-01-03 Nicolas Goaziou * org-indent.el (org-indent-mode): Completely refresh buffer - before starting org-indent-mode. Also set idle timer to refresh + before starting org-indent-mode. Also set idle timer to refresh only visible portion of buffer, and refresh the subtree instead of section when promoting or demoting it. (org-indent-add-properties): Rewrite function to proceed line by @@ -3797,7 +3798,7 @@ template for html so that the exported file is valid xhtml. Added template for odt. (org-inlinetask-export-handler): Fix typo in the regexp that - trims content. Make sure that the content is flanked by + trims content. Make sure that the content is flanked by paragraph boundaries on either side. 2012-01-03 Bastien Guerry @@ -4065,7 +4066,7 @@ 2012-01-03 Nicolas Goaziou * org.el (org-in-regexps-block-p): Return an useful value when - point is between START-RE and END-RE. No incomplete block is + point is between START-RE and END-RE. No incomplete block is allowed anymore. Add another optional argument to bound the bottom part of the search. (org-narrow-to-block, org-in-block-p): Apply modifications. @@ -4451,7 +4452,7 @@ 2011-07-28 Matt Lundin * org-bibtex.el (org-bibtex-create, org-bibtex-write): Change - argument of `org-toggle-tag' to 'on. (Other arguments, e.g., t, + argument of `org-toggle-tag' to 'on. (Other arguments, e.g., t, have no effect). 2011-07-28 Eric Schulte @@ -4835,7 +4836,7 @@ * ob-haskell.el (org-babel-haskell-export-to-lhs): Call `kill-buffer' with argument indiciating to kill current - buffer. Emacs 22 compatibility. + buffer. Emacs 22 compatibility. 2011-07-28 David Maus @@ -5027,7 +5028,7 @@ * 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 + the buffer may get deleted. This patch ensures deletion comes first, normalization second. 2011-07-28 Nicolas Goaziou @@ -5108,7 +5109,7 @@ * 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 + `org-footnote-at-reference-p'. No need to check if pattern isn't at beginning of the line elsewhere. 2011-07-28 Nicolas Goaziou @@ -5360,7 +5361,7 @@ * org-exp.el (org-export-backends): New variable. (org-export-select-backend-specific-text): Use above - variable. Also mark text between #+BACKEND and + variable. Also mark text between #+BACKEND and #+BEGIN_BACKEND...#+END_BACKEND with org-native-text property. This text property is currently used only by the new line-oriented generic exporter (which is not yet part of the repo). @@ -5787,7 +5788,7 @@ * org-exp.el (org-export): Use new compatibility function `org-activate-mark'. - * org-compat.el (org-activate-mark): New function. Provide + * org-compat.el (org-activate-mark): New function. Provide `activate-mark' if not present (e.g. Emacs 22). 2011-07-28 David Maus @@ -5957,14 +5958,14 @@ * org-html.el (org-export-as-html): Don't expand non-data lines of table.el tables. (org-html-expand): Removed the (buggy) test for non-data lines - in table.el tables. The test is now done as part of + in table.el tables. The test is now done as part of org-export-as-html. (org-format-table-table-html-using-table-generate-source): Added test for spanning of cells in table.el tables using - table.el's own library routine. Optionlly Suppress export of + table.el's own library routine. Optionally suppress export of simple table.el tables. (org-format-table-html): Removed the (buggy) test for spanned - table.el tables. The test is now done as part of + table.el tables. The test is now done as part of org-format-table-table-html-using-table-generate-source. 2011-07-28 Carsten Dominik @@ -6338,7 +6339,7 @@ function would not pay attention to drawers or blocks indentation. Thus, such constructs couldn't consistently end an item or a list. This patch ensures line indentation is stored (if applicable) - before skipping them. Also fixed doc-string and comments. + before skipping them. Also fixed doc-string and comments. 2011-07-28 Carsten Dominik @@ -6676,7 +6677,7 @@ 2011-07-28 Julien Danjou * org-latex.el (org-export-latex-date-format): Change default date - format to \today. This has the same result but respects the + format to \today. This has the same result but respects the language set in the document by default. 2011-07-28 Nicolas Goaziou @@ -6892,7 +6893,7 @@ (org-agenda-change-all-lines): Stop using prefix-length. * org-colview.el (org-columns-display-here): Stop using - prefix-length. Always return claned items. + prefix-length. Always return claned items. * org-mobile.el (org-mobile-write-agenda-for-mobile): Stop using prefix-length. @@ -6996,7 +6997,7 @@ 2011-07-28 Bastien Guerry - * org-html.el (org-export-as-html): bugfix: insert email + * org-html.el (org-export-as-html): Bugfix: insert email correctly. 2011-07-28 Bastien Guerry @@ -7437,7 +7438,7 @@ 2011-07-28 Julien Danjou * org-macs.el (org-with-point-at): Store evaluated version of - pom. This fixes a potential bug when using (org-with-point-at + pom. This fixes a potential bug when using (org-with-point-at (func) …), where (func) would be evaluated multiple times, therefore might return different results if a marker was returned and different each time. @@ -7706,7 +7707,7 @@ 2011-07-28 Nicolas Goaziou - * org.el (org-toggle-item): Now accepts a prefix argument. When + * org.el (org-toggle-item): Now accepts a prefix argument. When used without argument on normal text, it will make the whole region one item. With an argument, it defaults to old behavior: change each line in region into an item. @@ -7865,7 +7866,7 @@ * org-inlinetask.el (org-inlinetask-export-templates): Slightly modify templates so environment boundaries don't interfere with content of task. Unprotect content of task so it might benefit - from further transformations. Set original-indentation property to + from further transformations. Set original-indentation property to a high value to ensure that task is always in the last item of the list. Also, apply templates later in export process. @@ -7896,7 +7897,7 @@ * org-exp.el (org-export-preprocess-string): Mark list endings before babel blocks preprocessing starts, so blank lines that may be inserted do not break list's structure. Then, mark list with - special properties required by exporters. Thus output from babel + special properties required by exporters. Thus output from babel can easily be included in lists. (org-export-mark-list-end): New function. (org-export-mark-list-properties): New function. @@ -8001,7 +8002,7 @@ helper function is not optional anymore. (org-list-get-all-items): Shorten code with the help of cl.el. (org-list-get-children): Now returns all children of item, even if - they do not belong to the same list. Renamed from + they do not belong to the same list. Renamed from `org-list-get-all-children'. (org-list-get-list-begin): Function wasn't return value when item was already the first item of the list at point. @@ -10143,10 +10144,9 @@ 2010-11-11 Carsten Dominik * org-capture.el (org-capture-templates): New capture property - `:kill-buffer'. (org-capture-finalize): Kill target buffer if that - is desired. - (org-capture-target-buffer): Remember if we have to make the - buffer. + `:kill-buffer'. + (org-capture-finalize): Kill target buffer if that is desired. + (org-capture-target-buffer): Remember if we have to make the buffer. 2010-11-11 Carsten Dominik @@ -12235,7 +12235,7 @@ * org-list.el (org-insert-item-internal): New function to handle positioning and contents of an item being inserted at a specific - pos. It is not possible anymore to split a term in a description + pos. It is not possible anymore to split a term in a description list or a checkbox when inserting a new item. * org-list.el (org-insert-item): Refactored by using the new @@ -16332,9 +16332,8 @@ 2009-11-13 John Wiegley - * org-clock.el - (org-clock-auto-clock-resolution): Now takes three values: nil, t - and `when-no-clock-is-running'. + * org-clock.el (org-clock-auto-clock-resolution): Now takes three + values: nil, t and `when-no-clock-is-running'. (org-clock-in): Use `org-clock-auto-clock-resolution' to determine whether or not to resolve Org buffers on clock in. === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2012-07-11 23:13:41 +0000 +++ lisp/url/ChangeLog 2012-07-14 02:08:32 +0000 @@ -185,7 +185,7 @@ * url-queue.el (url-queue-retrieve): Take an optional `inhibit-cookies' parameter. - * url.el (url-retrieve): Ditto + * url.el (url-retrieve): Ditto. * url-http.el (url-http-create-request): Don't send cookies unless requested. === modified file 'lwlib/ChangeLog' --- lwlib/ChangeLog 2012-07-06 21:07:46 +0000 +++ lwlib/ChangeLog 2012-07-14 02:08:32 +0000 @@ -607,7 +607,7 @@ * xlwmenuP.h (_XlwMenu_part): Add top_depth. - * xlwmenu.h: Removed declaration of pop_up_menu + * xlwmenu.h: Removed declaration of pop_up_menu. * xlwmenu.c (Start): Get correct time if time in event is CurrentTime. (find_first_selectable, find_next_selectable) === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2012-06-30 15:32:51 +0000 +++ msdos/ChangeLog 2012-07-14 02:08:32 +0000 @@ -7,7 +7,7 @@ * sedleim.inp (MKDIR_P): Edit to DOS "md" command. - * sed1v2.inp: (LIB_CLOCK_GETTIME): Edit to empty. + * sed1v2.inp (LIB_CLOCK_GETTIME): Edit to empty. Remove lines that invoke PAXCTL. (clean): Fix recipe not to run Unixy shell commands. === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-07-13 11:49:26 +0000 +++ nt/ChangeLog 2012-07-14 02:08:32 +0000 @@ -6,7 +6,7 @@ (BROKEN_SIGPTY, BSD4_2, BSD_SYSTEM, BSD_SYSTEM_AHB, CYGWIN, DARWIN_OS) (FIRST_PTY_LETTER, GNU_LINUX, G_SLICE_ALWAYS_MALLOC, HAVE_PTYS) (HAVE_SOCKETS, HPUX, INTERRUPT_INPUT, IRIX6_5, NARROWPROTO, NO_ABORT) - (NO_EDITRES, NSIG_MINIMUM, PREFER_VSUSP, PTY_ITERATION + (NO_EDITRES, NSIG_MINIMUM, PREFER_VSUSP, PTY_ITERATION) (PTY_NAME_SPRINTF, PTY_OPEN, PTY_TTY_NAME_SPRINTF, RUN_TIME_REMAP) (SETPGRP_RELEASES_CTTY, SOLARIS2, TAB3, TABDLY, ULIMIT_BREAK_VALUE) (UNIX98_PTYS, USG, USG5, XOS_NEEDS_TIME_H, _AIX): New macros. === modified file 'oldXMenu/ChangeLog' --- oldXMenu/ChangeLog 2012-06-26 00:39:36 +0000 +++ oldXMenu/ChangeLog 2012-07-14 02:08:32 +0000 @@ -612,7 +612,7 @@ * copyright.h: New file (copied from X11R4 distribution) * All files: Replaced occurrences of #include - with #include "copyright.h" + with #include "copyright.h". 1991-10-25 Richard Stallman (rms@mole.gnu.ai.mit.edu) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-14 00:04:10 +0000 +++ src/ChangeLog 2012-07-14 02:08:32 +0000 @@ -88,7 +88,7 @@ * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to memcpy (Bug#11907). -2012-07-13 Kalle Kankare (tiny change) +2012-07-13 Kalle Kankare (tiny change) * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo and free it with DestroyExceptionInfo (Bug#11558). @@ -361,7 +361,7 @@ not functions. All uses rewritten to use the following, respectively: (emacs_secs_addr, invalid_emacs_time, get_emacs_time) (add_emacs_time, sub_emacs_time): New functions. - * atimer.c: Don't include , as "systime.h" does this. + * atimer.c: Don't include , as "systime.h" does this. * fileio.c (Fcopy_file): * xterm.c (XTflash): Get the current time closer to when it's used. * makefile.w32-in ($(BLD)/atimer.$(O)): Update dependencies. @@ -682,7 +682,7 @@ X Windows version. Doc fix. * xfns.c (Fx_window_property): Doc fix. (Bug#11870) -2012-07-06 Juanma Barranquero +2012-07-06 Juanma Barranquero Eli Zaretskii * s/ms-w32.h: Settings not specific to Windows moved to nt/config.nt. @@ -921,7 +921,7 @@ * alloc.c (PSEUDOVECTOR_NBYTES): Remove stray ';' that causes compilation to fail on pre-C99 compilers. -2012-07-04 Juanma Barranquero +2012-07-04 Juanma Barranquero * s/ms-w32.h (LISP_FLOAT_TYPE, HAVE_MEMCMP, HAVE_MEMCPY) (HAVE_MEMMOVE, HAVE_MEMSET): Don't set, obsolete. ------------------------------------------------------------ revno: 109083 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-07-13 20:06:05 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2012-07-13 10:17:28 +0000 +++ autogen/config.in 2012-07-14 00:06:05 +0000 @@ -155,6 +155,17 @@ /* Define this to check for short string overrun. */ #undef GC_CHECK_STRING_OVERRUN +/* Mark a secondary stack, like the register stack on the ia64. */ +#undef GC_MARK_SECONDARY_STACK + +/* Define to GC_USE_GCPROS_AS_BEFORE if conservative garbage collection is not + known to work. */ +#undef GC_MARK_STACK + +/* Define if setjmp is known to save all registers relevant for conservative + garbage collection in the jmp_buf. */ +#undef GC_SETJMP_WORKS + /* Define to 1 if the `getpgrp' function requires zero arguments. */ #undef GETPGRP_VOID @@ -1229,6 +1240,9 @@ /* Define if process.c:child_setup should not call setpgrp. */ #undef SETPGRP_RELEASES_CTTY +/* How to set up a slave PTY, if needed. */ +#undef SETUP_SLAVE_PTY + /* Make process_send_signal work by "typing" a signal character on the pty. */ #undef SIGNALS_VIA_CHARACTERS @@ -1658,15 +1672,6 @@ #undef noinline #endif -/* These won't be used automatically yet. We also need to know, at least, - that the stack is continuous. */ -#ifdef __GNUC__ -# ifndef GC_SETJMP_WORKS - /* GC_SETJMP_WORKS is nearly always appropriate for GCC. */ -# define GC_SETJMP_WORKS 1 -# endif -#endif - #endif /* EMACS_CONFIG_H */ /* === modified file 'autogen/configure' --- autogen/configure 2012-07-13 10:17:28 +0000 +++ autogen/configure 2012-07-14 00:06:05 +0000 @@ -22843,20 +22843,25 @@ ;; sol2* ) + $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptsname (int), *ptyname; sigblock (sigmask (SIGCLD)); if (grantpt (fd) == -1) { emacs_close (fd); return -1; } sigunblock (sigmask (SIGCLD)); if (unlockpt (fd) == -1) { emacs_close (fd); return -1; } if (!(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); } " >>confdefs.h + + ;; + + unixware ) + $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptsname (int), *ptyname; sigblock(sigmask(SIGCLD)); if (grantpt(fd) == -1) fatal(\"could not grant slave pty\"); sigunblock(sigmask(SIGCLD)); if (unlockpt(fd) == -1) fatal(\"could not unlock slave pty\"); if (!(ptyname = ptsname(fd))) fatal (\"could not enable slave pty\"); snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); } " >>confdefs.h + + ;; +esac + + +case $opsys in + sol2* | unixware ) $as_echo "#define FIRST_PTY_LETTER 'z'" >>confdefs.h $as_echo "#define PTY_NAME_SPRINTF strcpy (pty_name, \"/dev/ptmx\"); " >>confdefs.h - $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptsname (int), *ptyname; sigblock (sigmask (SIGCLD)); if (grantpt (fd) == -1) { emacs_close (fd); return -1; } sigunblock (sigmask (SIGCLD)); if (unlockpt (fd) == -1) { emacs_close (fd); return -1; } if (!(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); } " >>confdefs.h - - ;; - - unixware ) - $as_echo "#define FIRST_PTY_LETTER 'z'" >>confdefs.h - - $as_echo "#define PTY_NAME_SPRINTF strcpy (pty_name, \"/dev/ptmx\"); " >>confdefs.h - - $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptsname (int), *ptyname; sigblock(sigmask(SIGCLD)); if (grantpt(fd) == -1) fatal(\"could not grant slave pty\"); sigunblock(sigmask(SIGCLD)); if (unlockpt(fd) == -1) fatal(\"could not unlock slave pty\"); if (!(ptyname = ptsname(fd))) fatal (\"could not enable slave pty\"); snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); } " >>confdefs.h + +$as_echo "#define SETUP_SLAVE_PTY if (ioctl (xforkin, I_PUSH, \"ptem\") == -1) fatal (\"ioctl I_PUSH ptem\"); if (ioctl (xforkin, I_PUSH, \"ldterm\") == -1) fatal (\"ioctl I_PUSH ldterm\"); if (ioctl (xforkin, I_PUSH, \"ttcompat\") == -1) fatal (\"ioctl I_PUSH ttcompat\");" >>confdefs.h ;; esac @@ -23056,6 +23061,28 @@ fi rm -f conftest.err conftest.$ac_ext + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifndef __ia64__ +# error "not ia64" +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +$as_echo "#define GC_MARK_SECONDARY_STACK() do { extern void *__libc_ia64_register_backing_store_base; __builtin_ia64_flushrs (); mark_memory (__libc_ia64_register_backing_store_base, __builtin_ia64_bsp ());} while (0)" >>confdefs.h + +fi +rm -f conftest.err conftest.$ac_ext ;; hpux*) @@ -23071,6 +23098,62 @@ esac + + + + + +case $opsys in + aix4-2 | hpux* | unixware) + $as_echo "#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE" >>confdefs.h + + ;; + + gnu-linux | gnu-kfreebsd ) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#if defined __i386__ || defined __sparc__ || defined __mc68000__ \ + || defined __alpha__ || defined __mips__ || defined __s390__ \ + || defined __arm__ || defined __powerpc__ || defined __amd64__ \ + || defined __ia64__ || defined __sh__ +/* ok */ +#else +# error "setjmp not known to work on this arch" +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + $as_echo "#define GC_SETJMP_WORKS 1" >>confdefs.h + +else + $as_echo "#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE" >>confdefs.h + +fi +rm -f conftest.err conftest.$ac_ext + ;; +esac + + +if test x$GCC = xyes; then + $as_echo "#define GC_SETJMP_WORKS 1" >>confdefs.h + +else + case $opsys in + freebsd | netbsd | openbsd | irix6-5 | sol2* ) + $as_echo "#define GC_SETJMP_WORKS 1" >>confdefs.h + + ;; + esac +fi + case $opsys in hpux* | sol2* ) ------------------------------------------------------------ revno: 109082 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-07-13 20:04:10 -0400 message: Move GC_SETJMP_WORKS, GC_MARK_STACK from src/s to configure * configure.ac (GC_SETJMP_WORKS, GC_MARK_STACK): Move here from src/s. (AH_BOTTOM): Move GC_SETJMP_WORKS GCC fallback to main body. * src/s/aix4-2.h, src/s/freebsd.h, src/s/gnu-linux.h, src/s/hpux10-20.h: * src/s/irix6-5.h, src/s/netbsd.h, src/s/sol2-6.h, src/s/unixware.h: Let configure set GC_SETJMP_WORKS, GC_MARK_STACK. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-13 21:54:35 +0000 +++ ChangeLog 2012-07-14 00:04:10 +0000 @@ -1,3 +1,8 @@ +2012-07-14 Glenn Morris + + * configure.ac (GC_SETJMP_WORKS, GC_MARK_STACK): Move here from src/s. + (AH_BOTTOM): Move GC_SETJMP_WORKS GCC fallback to main body. + 2012-07-13 Glenn Morris * configure.ac (opsysfile): Set to empty on gnu, cygwin. === modified file 'configure.ac' --- configure.ac 2012-07-13 21:54:35 +0000 +++ configure.ac 2012-07-14 00:04:10 +0000 @@ -3600,6 +3600,55 @@ esac +dnl These won't be used automatically yet. We also need to know, at least, +dnl that the stack is continuous. +AH_TEMPLATE(GC_SETJMP_WORKS, [Define if setjmp is known to save all + registers relevant for conservative garbage collection in the jmp_buf.]) + +AH_TEMPLATE(GC_MARK_STACK, [Define to GC_USE_GCPROS_AS_BEFORE if + conservative garbage collection is not known to work.]) + + +case $opsys in + aix4-2 | hpux* | unixware) + dnl Conservative garbage collection has not been tested, so for now + dnl play it safe and stick with the old-fashioned way of marking. + AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE]) + ;; + + dnl Not all the architectures are tested, but there are Debian packages + dnl for SCM and/or Guile on them, so the technique must work. See also + dnl comments in alloc.c concerning setjmp and gcc. + dnl Fixme: it's probably safe to just use the GCC conditional below. + gnu-linux | gnu-kfreebsd ) + AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ +#if defined __i386__ || defined __sparc__ || defined __mc68000__ \ + || defined __alpha__ || defined __mips__ || defined __s390__ \ + || defined __arm__ || defined __powerpc__ || defined __amd64__ \ + || defined __ia64__ || defined __sh__ +/* ok */ +#else +# error "setjmp not known to work on this arch" +#endif + ]], [[]])], AC_DEFINE(GC_SETJMP_WORKS, 1), + AC_DEFINE(GC_MARK_STACK, [GC_USE_GCPROS_AS_BEFORE]) ) + ;; +esac + + +if test x$GCC = xyes; then + dnl GC_SETJMP_WORKS is nearly always appropriate for GCC. + AC_DEFINE(GC_SETJMP_WORKS, 1) +else + case $opsys in + dnl irix: Tested on Irix 6.5. SCM worked on earlier versions. + freebsd | netbsd | openbsd | irix6-5 | sol2* ) + AC_DEFINE(GC_SETJMP_WORKS, 1) + ;; + esac +fi dnl GCC? + + dnl Used in xfaces.c. case $opsys in hpux* | sol2* ) @@ -4221,15 +4270,6 @@ #undef noinline #endif -/* These won't be used automatically yet. We also need to know, at least, - that the stack is continuous. */ -#ifdef __GNUC__ -# ifndef GC_SETJMP_WORKS - /* GC_SETJMP_WORKS is nearly always appropriate for GCC. */ -# define GC_SETJMP_WORKS 1 -# endif -#endif - #endif /* EMACS_CONFIG_H */ /* === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 21:54:35 +0000 +++ src/ChangeLog 2012-07-14 00:04:10 +0000 @@ -1,3 +1,9 @@ +2012-07-14 Glenn Morris + + * s/aix4-2.h, s/freebsd.h, s/gnu-linux.h, s/hpux10-20.h: + * s/irix6-5.h, s/netbsd.h, s/sol2-6.h, s/unixware.h: + Let configure set GC_SETJMP_WORKS, GC_MARK_STACK. + 2012-07-13 Glenn Morris * s/gnu-linux.h (GC_MARK_SECONDARY_STACK): Let configure set it. === modified file 'src/s/aix4-2.h' --- src/s/aix4-2.h 2012-07-13 02:34:05 +0000 +++ src/s/aix4-2.h 2012-07-14 00:04:10 +0000 @@ -19,6 +19,3 @@ /* Perry Smith says these are correct. */ #undef sigmask -/* Conservative garbage collection has not been tested, so for now - play it safe and stick with the old-fashioned way of marking. */ -#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE === modified file 'src/s/freebsd.h' --- src/s/freebsd.h 2012-07-13 02:38:30 +0000 +++ src/s/freebsd.h 2012-07-14 00:04:10 +0000 @@ -20,6 +20,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the jmp_buf. */ -#define GC_SETJMP_WORKS 1 === modified file 'src/s/gnu-linux.h' --- src/s/gnu-linux.h 2012-07-13 21:54:35 +0000 +++ src/s/gnu-linux.h 2012-07-14 00:04:10 +0000 @@ -20,18 +20,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the jmp_buf. - Not all the architectures are tested, but there are Debian packages - for SCM and/or Guile on them, so the technique must work. See also - comments in alloc.c concerning setjmp and gcc. Fixme: it's - probably safe to just let the GCC conditional in AH_BOTTOM handle this. -*/ -#if defined __i386__ || defined __sparc__ || defined __mc68000__ \ - || defined __alpha__ || defined __mips__ || defined __s390__ \ - || defined __arm__ || defined __powerpc__ || defined __amd64__ \ - || defined __ia64__ || defined __sh__ -#define GC_SETJMP_WORKS 1 -#else -#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE -#endif === modified file 'src/s/hpux10-20.h' --- src/s/hpux10-20.h 2012-07-13 02:34:05 +0000 +++ src/s/hpux10-20.h 2012-07-14 00:04:10 +0000 @@ -25,7 +25,3 @@ Note we also undef HAVE_RANDOM via configure. */ #undef srandom #undef random - -/* Conservative garbage collection has not been tested, so for now - play it safe and stick with the old-fashioned way of marking. */ -#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE === modified file 'src/s/irix6-5.h' --- src/s/irix6-5.h 2012-07-13 21:45:55 +0000 +++ src/s/irix6-5.h 2012-07-14 00:04:10 +0000 @@ -30,5 +30,3 @@ #undef TIOCSIGSEND /* defined in usg5-4-common.h */ -/* Tested on Irix 6.5. SCM worked on earlier versions. */ -#define GC_SETJMP_WORKS 1 === modified file 'src/s/netbsd.h' --- src/s/netbsd.h 2012-07-13 02:38:30 +0000 +++ src/s/netbsd.h 2012-07-14 00:04:10 +0000 @@ -22,6 +22,3 @@ that are handled with CPP __RENAME() macro in signal.h. */ #include -/* Tell that garbage collector that setjmp is known to save all - registers relevant for conservative garbage collection in the jmp_buf. */ -#define GC_SETJMP_WORKS 1 === modified file 'src/s/sol2-6.h' --- src/s/sol2-6.h 2012-07-13 02:34:05 +0000 +++ src/s/sol2-6.h 2012-07-14 00:04:10 +0000 @@ -19,4 +19,3 @@ #include "usg5-4-common.h" -#define GC_SETJMP_WORKS 1 === modified file 'src/s/unixware.h' --- src/s/unixware.h 2012-07-12 07:43:05 +0000 +++ src/s/unixware.h 2012-07-14 00:04:10 +0000 @@ -17,9 +17,4 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ - #include "usg5-4-common.h" - -/* Conservative garbage collection has not been tested, so for now - play it safe and stick with the old-fashioned way of marking. */ -#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE ------------------------------------------------------------ revno: 109081 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-07-13 17:54:35 -0400 message: Move GC_MARK_SECONDARY_STACK from src/s to configure * configure.ac (GC_MARK_SECONDARY_STACK): Move here from src/s. * src/s/gnu-linux.h (GC_MARK_SECONDARY_STACK): Let configure set it. diff: === modified file 'ChangeLog' --- ChangeLog 2012-07-13 02:38:30 +0000 +++ ChangeLog 2012-07-13 21:54:35 +0000 @@ -8,8 +8,8 @@ (BSD_SYSTEM_AHB): New hack macro. (AH_BOTTOM): Set BSD_SYSTEM, using BSD_SYSTEM_AHB. - * configure.ac (NSIG_MINIMUM, ULIMIT_BREAK_VALUE): - Move here from src/s. + * configure.ac (NSIG_MINIMUM, ULIMIT_BREAK_VALUE, SETUP_SLAVE_PTY) + (GC_MARK_SECONDARY_STACK): Move here from src/s. 2012-07-12 Glenn Morris === modified file 'configure.ac' --- configure.ac 2012-07-13 21:45:55 +0000 +++ configure.ac 2012-07-13 21:54:35 +0000 @@ -3578,6 +3578,14 @@ # error "not i386" #endif ]], [[]])], AC_DEFINE(ULIMIT_BREAK_VALUE, [(32*1024*1024)]), []) + + AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ +#ifndef __ia64__ +# error "not ia64" +#endif + ]], [[]])], AC_DEFINE(GC_MARK_SECONDARY_STACK(), + [do { extern void *__libc_ia64_register_backing_store_base; __builtin_ia64_flushrs (); mark_memory (__libc_ia64_register_backing_store_base, __builtin_ia64_bsp ());} while (0)], + [Mark a secondary stack, like the register stack on the ia64.]), []) ;; hpux*) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 21:45:55 +0000 +++ src/ChangeLog 2012-07-13 21:54:35 +0000 @@ -1,5 +1,7 @@ 2012-07-13 Glenn Morris + * s/gnu-linux.h (GC_MARK_SECONDARY_STACK): Let configure set it. + * s/usg5-4-common.h (SETUP_SLAVE_PTY): Let configure set it. * s/irix6-5.h (SETUP_SLAVE_PTY): No more need to unset it. === modified file 'src/s/gnu-linux.h' --- src/s/gnu-linux.h 2012-07-13 02:34:05 +0000 +++ src/s/gnu-linux.h 2012-07-13 21:54:35 +0000 @@ -20,16 +20,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -#ifdef __ia64__ -#define GC_MARK_SECONDARY_STACK() \ - do { \ - extern void *__libc_ia64_register_backing_store_base; \ - __builtin_ia64_flushrs (); \ - mark_memory (__libc_ia64_register_backing_store_base, \ - __builtin_ia64_bsp ()); \ - } while (0) -#endif - /* Tell that garbage collector that setjmp is known to save all registers relevant for conservative garbage collection in the jmp_buf. Not all the architectures are tested, but there are Debian packages ------------------------------------------------------------ revno: 109080 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-07-13 17:45:55 -0400 message: Move SETUP_SLAVE_PTY from src/s to configure * configure.ac (SETUP_SLAVE_PTY): Move here from src/s. (FIRST_PTY_LETTER, PTY_NAME_SPRINTF): Combine sol2/unixware cases. * src/s/usg5-4-common.h (SETUP_SLAVE_PTY): Let configure set it. * src/s/irix6-5.h (SETUP_SLAVE_PTY): No more need to unset it. diff: === modified file 'configure.ac' --- configure.ac 2012-07-13 02:38:30 +0000 +++ configure.ac 2012-07-13 21:45:55 +0000 @@ -3412,10 +3412,6 @@ ;; sol2* ) - dnl This change means that we don't loop through allocate_pty too - dnl many times in the (rare) event of a failure. - AC_DEFINE(FIRST_PTY_LETTER, ['z']) - AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");] ) dnl Uses sigblock/sigunblock rather than sighold/sigrelse, dnl which appear to be BSD4.1 specific. It may also be appropriate dnl for SVR4.x (x<2) but I'm not sure. fnf@cygnus.com @@ -3425,15 +3421,25 @@ AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; sigblock (sigmask (SIGCLD)); if (grantpt (fd) == -1) { emacs_close (fd); return -1; } sigunblock (sigmask (SIGCLD)); if (unlockpt (fd) == -1) { emacs_close (fd); return -1; } if (!(ptyname = ptsname (fd))) { emacs_close (fd); return -1; } snprintf (pty_name, sizeof pty_name, "%s", ptyname); }] ) ;; - dnl Comments are as per sol2*. unixware ) - AC_DEFINE(FIRST_PTY_LETTER, ['z']) - AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");] ) + dnl Comments are as per sol2*. AC_DEFINE(PTY_TTY_NAME_SPRINTF, [{ char *ptsname (int), *ptyname; sigblock(sigmask(SIGCLD)); if (grantpt(fd) == -1) fatal("could not grant slave pty"); sigunblock(sigmask(SIGCLD)); if (unlockpt(fd) == -1) fatal("could not unlock slave pty"); if (!(ptyname = ptsname(fd))) fatal ("could not enable slave pty"); snprintf (pty_name, sizeof pty_name, "%s", ptyname); }] ) ;; esac +case $opsys in + sol2* | unixware ) + dnl This change means that we don't loop through allocate_pty too + dnl many times in the (rare) event of a failure. + AC_DEFINE(FIRST_PTY_LETTER, ['z']) + AC_DEFINE(PTY_NAME_SPRINTF, [strcpy (pty_name, "/dev/ptmx");] ) + dnl Push various streams modules onto a PTY channel. Used in process.c. + AC_DEFINE(SETUP_SLAVE_PTY, [if (ioctl (xforkin, I_PUSH, "ptem") == -1) fatal ("ioctl I_PUSH ptem"); if (ioctl (xforkin, I_PUSH, "ldterm") == -1) fatal ("ioctl I_PUSH ldterm"); if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) fatal ("ioctl I_PUSH ttcompat");], [How to set up a slave PTY, if needed.]) + ;; +esac + + AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by "typing" a signal character on the pty.]) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 18:03:10 +0000 +++ src/ChangeLog 2012-07-13 21:45:55 +0000 @@ -1,3 +1,8 @@ +2012-07-13 Glenn Morris + + * s/usg5-4-common.h (SETUP_SLAVE_PTY): Let configure set it. + * s/irix6-5.h (SETUP_SLAVE_PTY): No more need to unset it. + 2012-07-13 Jan Djärv * nsterm.m (uRect): Only define if NS_IMPL_GNUSTEP. === modified file 'src/s/irix6-5.h' --- src/s/irix6-5.h 2012-07-13 02:34:05 +0000 +++ src/s/irix6-5.h 2012-07-13 21:45:55 +0000 @@ -22,8 +22,6 @@ #undef _longjmp /* use system versions, not conservative aliases */ #undef _setjmp -#undef SETUP_SLAVE_PTY - #ifdef emacs char *_getpty(); #endif === modified file 'src/s/usg5-4-common.h' --- src/s/usg5-4-common.h 2012-07-13 02:34:05 +0000 +++ src/s/usg5-4-common.h 2012-07-13 21:45:55 +0000 @@ -52,11 +52,3 @@ this is all we need. */ #define TIOCSIGSEND TIOCSIGNAL -/* Push various streams modules onto a PTY channel. */ -#define SETUP_SLAVE_PTY \ - if (ioctl (xforkin, I_PUSH, "ptem") == -1) \ - fatal ("ioctl I_PUSH ptem"); \ - if (ioctl (xforkin, I_PUSH, "ldterm") == -1) \ - fatal ("ioctl I_PUSH ldterm"); \ - if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ - fatal ("ioctl I_PUSH ttcompat"); ------------------------------------------------------------ revno: 109079 committer: Andreas Schwab branch nick: emacs timestamp: Fri 2012-07-13 20:15:22 +0200 message: Fixes: debbugs:11938 * emacs-lisp/cl.el (labels): Remove spurious quote. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-13 17:02:18 +0000 +++ lisp/ChangeLog 2012-07-13 18:15:22 +0000 @@ -1,3 +1,7 @@ +2012-07-13 Andreas Schwab + + * emacs-lisp/cl.el (labels): Remove spurious quote. (Bug#11938) + 2012-07-13 Juanma Barranquero * bindings.el (top): Use `mapc' instead of `mapcar'. === modified file 'lisp/emacs-lisp/cl.el' --- lisp/emacs-lisp/cl.el 2012-07-11 23:13:41 +0000 +++ lisp/emacs-lisp/cl.el 2012-07-13 18:15:22 +0000 @@ -489,7 +489,7 @@ "Make temporary function bindings. Like `cl-labels' except that the lexical scoping is handled via `lexical-let' rather than relying on `lexical-binding'." - (declare (indent 1) (debug cl-flet) (obsolete 'cl-labels "24.2")) + (declare (indent 1) (debug cl-flet) (obsolete cl-labels "24.2")) (let ((vars nil) (sets nil) (newenv macroexpand-all-environment)) (dolist (binding bindings) ;; It's important that (not (eq (symbol-name var1) (symbol-name var2))) ------------------------------------------------------------ revno: 109078 committer: Jan D. branch nick: trunk timestamp: Fri 2012-07-13 20:03:10 +0200 message: Remove compiler warnings in objective-C files. * nsfns.m (x_set_icon_name, ns_set_name_internal) (ns_set_name_as_filename, ns_implicitly_set_icon_type) (x_set_icon_type, ns_lisp_to_cursor_type, Fns_read_file_name) (Fns_get_resource, Fns_set_resource, Fx_open_connection) (Fns_font_name, Fns_perform_service) (Fns_convert_utf8_nfd_to_nfc, ns_do_applescript) (Fns_do_applescript, Fx_show_tip): Use SSDATA where appropriate. (ns_set_name): Remove unused variable view. (x_set_menu_bar_lines): Remove unused variable olines. (x_set_tool_bar_lines): Remove unused variable root_window. (Fns_list_colors): Put () around assignment in while statement. (Fns_perform_service): Remove unused variable len. (Fns_display_usable_bounds): Remove unused variable top. (syms_of_nsfns): Remove unused variable i. * nsfont.m (ns_get_family, ns_lang_to_script, ns_otf_to_script) (ns_registry_to_script, ns_get_req_script, nsfont_open): Use SSDATA where appropriate. (ns_get_covering_families, ns_findfonts, nsfont_list_family): Put () around assignment in loop statement. (nsfont_open): Remove unused variable i. (nsfont_open): Remove unused variable len. (nsfont_draw): Remove unused variable cs. * nsimage.m (ns_load_image, allocInitFromFile): Use SSDATA where appropriate. (setXBMColor): Remove unused variable len. (setPixmapData): Put () around assignment in loop statement. * nsmenu.m (ns_update_menubar, ns_menu_show, process_dialog) (initFromContents): Use SSDATA where appropriate. (ns_update_menubar): Add braces to ambigous if-else. (initWithTitle): Put () around assignment in if statement. (ns_menu_show): Remove unused variables window and keymap. (update_frame_tool_bar): Remove unused variable selected_p. (initWithContentRect): Remove unused variable this_cmd_name. * nsterm.h (menuDown): Add id as type to argument sender. (ns_display_info_for_name): Add Lisp_Object argument. (ns_term_init): Add Lisp_Object argument. (ns_map_event_to_object): Add void argument. (ns_string_from_pasteboard, ns_string_to_pasteboard): Add correct prototype with arguments and only declare if __OBJC__. (nxatoms_of_nsselect): Add void argument. (ns_lisp_to_cursor_type): Add Lisp_Object argument. (ns_alloc_autorelease_pool): Add void argument. (ns_release_autorelease_pool): Add void* argument. (ns_get_defaults_value): Add const char* argument. * nsterm.m (uRect): Only define if NS_IMPL_GNUSTEP. (x_free_frame_resources): Pass x_free_frame_resources to NSTRACE. (ns_lisp_to_color, ns_string_to_lispmod, ns_term_init) (ns_term_shutdown, requestService, initFrameFromEmacs): Use SSDATA where appropriate. (ns_exec_path, ns_load_path, changeFont): Put () around assignment used as boolean expression. (x_set_window_size): Remove unused variable toolbar. (ns_get_color_default, ns_mod_to_lisp): Remove. (ns_mouse_position): Remove unused variables xchar and ychar. (ns_compute_glyph_string_overhangs): Remove unused variable face. (ns_set_vertical_scroll_bar): Remove unused variable count. (ns_delete_terminal): Remove unused variable i. (ns_term_init): Remove unused variables r, g and b. (mouseDown): Remove unused variable window. (windowDidResize): Move definition of theWindow inside NS_IMPL_GNUSTEP. (initFrameFromEmacs): Remove unused variable vbextra. (mouseEntered): Remove unused variables p and dpyinfo. (mouseExited): Remove unused variables p and r. (ns_define_frame_cursor, ns_clear_frame_area) (ns_draw_window_cursor, ns_initialize_display_info): Make static. (menuDown): Assign [sender tag] to variable and cast the variable. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 17:07:02 +0000 +++ src/ChangeLog 2012-07-13 18:03:10 +0000 @@ -1,5 +1,77 @@ 2012-07-13 Jan Djärv + * nsterm.m (uRect): Only define if NS_IMPL_GNUSTEP. + (x_free_frame_resources): Pass x_free_frame_resources to NSTRACE. + (ns_lisp_to_color, ns_string_to_lispmod, ns_term_init) + (ns_term_shutdown, requestService, initFrameFromEmacs): Use SSDATA + where appropriate. + (ns_exec_path, ns_load_path, changeFont): Put () around assignment used + as boolean expression. + (x_set_window_size): Remove unused variable toolbar. + (ns_get_color_default, ns_mod_to_lisp): Remove. + (ns_mouse_position): Remove unused variables xchar and ychar. + (ns_compute_glyph_string_overhangs): Remove unused variable face. + (ns_set_vertical_scroll_bar): Remove unused variable count. + (ns_delete_terminal): Remove unused variable i. + (ns_term_init): Remove unused variables r, g and b. + (mouseDown): Remove unused variable window. + (windowDidResize): Move definition of theWindow inside NS_IMPL_GNUSTEP. + (initFrameFromEmacs): Remove unused variable vbextra. + (mouseEntered): Remove unused variables p and dpyinfo. + (mouseExited): Remove unused variables p and r. + (ns_define_frame_cursor, ns_clear_frame_area) + (ns_draw_window_cursor, ns_initialize_display_info): Make static. + (menuDown): Assign [sender tag] to variable and cast the variable. + + * nsterm.h (menuDown): Add id as type to argument sender. + (ns_display_info_for_name): Add Lisp_Object argument. + (ns_term_init): Add Lisp_Object argument. + (ns_map_event_to_object): Add void argument. + (ns_string_from_pasteboard, ns_string_to_pasteboard): Add correct + prototype with arguments and only declare if __OBJC__. + (nxatoms_of_nsselect): Add void argument. + (ns_lisp_to_cursor_type): Add Lisp_Object argument. + (ns_alloc_autorelease_pool): Add void argument. + (ns_release_autorelease_pool): Add void* argument. + (ns_get_defaults_value): Add const char* argument. + + * nsmenu.m (ns_update_menubar, ns_menu_show, process_dialog) + (initFromContents): Use SSDATA where appropriate. + (ns_update_menubar): Add braces to ambigous if-else. + (initWithTitle): Put () around assignment in if statement. + (ns_menu_show): Remove unused variables window and keymap. + (update_frame_tool_bar): Remove unused variable selected_p. + (initWithContentRect): Remove unused variable this_cmd_name. + + * nsimage.m (ns_load_image, allocInitFromFile): Use SSDATA where + appropriate. + (setXBMColor): Remove unused variable len. + (setPixmapData): Put () around assignment in loop statement. + + * nsfont.m (ns_get_family, ns_lang_to_script, ns_otf_to_script) + (ns_registry_to_script, ns_get_req_script, nsfont_open): Use SSDATA + where appropriate. + (ns_get_covering_families, ns_findfonts, nsfont_list_family): Put () + around assignment in loop statement. + (nsfont_open): Remove unused variable i. + (nsfont_open): Remove unused variable len. + (nsfont_draw): Remove unused variable cs. + + * nsfns.m (x_set_icon_name, ns_set_name_internal) + (ns_set_name_as_filename, ns_implicitly_set_icon_type) + (x_set_icon_type, ns_lisp_to_cursor_type, Fns_read_file_name) + (Fns_get_resource, Fns_set_resource, Fx_open_connection) + (Fns_font_name, Fns_perform_service) + (Fns_convert_utf8_nfd_to_nfc, ns_do_applescript) + (Fns_do_applescript, Fx_show_tip): Use SSDATA where appropriate. + (ns_set_name): Remove unused variable view. + (x_set_menu_bar_lines): Remove unused variable olines. + (x_set_tool_bar_lines): Remove unused variable root_window. + (Fns_list_colors): Put () around assignment in while statement. + (Fns_perform_service): Remove unused variable len. + (Fns_display_usable_bounds): Remove unused variable top. + (syms_of_nsfns): Remove unused variable i. + * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to memcpy (Bug#11907). === modified file 'src/nsfns.m' --- src/nsfns.m 2012-07-06 21:07:46 +0000 +++ src/nsfns.m 2012-07-13 18:03:10 +0000 @@ -471,11 +471,11 @@ if ([[view window] miniwindowTitle] && ([[[view window] miniwindowTitle] isEqualToString: [NSString stringWithUTF8String: - SDATA (arg)]])) + SSDATA (arg)]])) return; [[view window] setMiniwindowTitle: - [NSString stringWithUTF8String: SDATA (arg)]]; + [NSString stringWithUTF8String: SSDATA (arg)]]; } static void @@ -490,7 +490,7 @@ encoded_name = ENCODE_UTF_8 (name); UNGCPRO; - str = [NSString stringWithUTF8String: SDATA (encoded_name)]; + str = [NSString stringWithUTF8String: SSDATA (encoded_name)]; /* Don't change the name if it's already NAME. */ if (! [[[view window] title] isEqualToString: str]) @@ -501,7 +501,7 @@ else encoded_icon_name = ENCODE_UTF_8 (f->icon_name); - str = [NSString stringWithUTF8String: SDATA (encoded_icon_name)]; + str = [NSString stringWithUTF8String: SSDATA (encoded_icon_name)]; if ([[view window] miniwindowTitle] && ! [[[view window] miniwindowTitle] isEqualToString: str]) @@ -512,7 +512,6 @@ static void ns_set_name (struct frame *f, Lisp_Object name, int explicit) { - NSView *view; NSTRACE (ns_set_name); if (ns_in_resize) @@ -641,14 +640,14 @@ title = FRAME_ICONIFIED_P (f) ? [[[view window] miniwindowTitle] UTF8String] : [[[view window] title] UTF8String]; - if (title && (! strcmp (title, SDATA (encoded_name)))) + if (title && (! strcmp (title, SSDATA (encoded_name)))) { [pool release]; UNBLOCK_INPUT; return; } - str = [NSString stringWithUTF8String: SDATA (encoded_name)]; + str = [NSString stringWithUTF8String: SSDATA (encoded_name)]; if (str == nil) str = @"Bad coding"; if (FRAME_ICONIFIED_P (f)) @@ -663,7 +662,7 @@ encoded_filename = ENCODE_UTF_8 (filename); UNGCPRO; - fstr = [NSString stringWithUTF8String: SDATA (encoded_filename)]; + fstr = [NSString stringWithUTF8String: SSDATA (encoded_filename)]; if (fstr == nil) fstr = @""; #ifdef NS_IMPL_COCOA /* work around a bug observed on 10.3 and later where @@ -706,7 +705,6 @@ x_set_menu_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; - int olines = FRAME_MENU_BAR_LINES (f); if (FRAME_MINIBUF_ONLY_P (f)) return; @@ -737,7 +735,6 @@ x_set_tool_bar_lines (struct frame *f, Lisp_Object value, Lisp_Object oldval) { int nlines; - Lisp_Object root_window; if (FRAME_MINIBUF_ONLY_P (f)) return; @@ -780,7 +777,7 @@ BLOCK_INPUT; pool = [[NSAutoreleasePool alloc] init]; if (f->output_data.ns->miniimage - && [[NSString stringWithUTF8String: SDATA (f->name)] + && [[NSString stringWithUTF8String: SSDATA (f->name)] isEqualToString: [(NSImage *)f->output_data.ns->miniimage name]]) { [pool release]; @@ -802,10 +799,10 @@ { elt = XCAR (chain); /* special case: 't' means go by file type */ - if (SYMBOLP (elt) && EQ (elt, Qt) && SDATA (f->name)[0] == '/') + if (SYMBOLP (elt) && EQ (elt, Qt) && SSDATA (f->name)[0] == '/') { NSString *str - = [NSString stringWithUTF8String: SDATA (f->name)]; + = [NSString stringWithUTF8String: SSDATA (f->name)]; if ([[NSFileManager defaultManager] fileExistsAtPath: str]) image = [[[NSWorkspace sharedWorkspace] iconForFile: str] retain]; } @@ -818,7 +815,7 @@ if (image == nil) image = [[NSImage imageNamed: [NSString stringWithUTF8String: - SDATA (XCDR (elt))]] retain]; + SSDATA (XCDR (elt))]] retain]; } } @@ -847,7 +844,7 @@ if (!NILP (arg) && SYMBOLP (arg)) { - arg =build_string (SDATA (SYMBOL_NAME (arg))); + arg =build_string (SSDATA (SYMBOL_NAME (arg))); store_frame_param (f, Qicon_type, arg); } @@ -863,7 +860,7 @@ image = [EmacsImage allocInitFromFile: arg]; if (image == nil) image =[NSImage imageNamed: [NSString stringWithUTF8String: - SDATA (arg)]]; + SSDATA (arg)]]; if (image == nil) { @@ -892,9 +889,9 @@ { char *str; if (XTYPE (arg) == Lisp_String) - str = SDATA (arg); + str = SSDATA (arg); else if (XTYPE (arg) == Lisp_Symbol) - str = SDATA (SYMBOL_NAME (arg)); + str = SSDATA (SYMBOL_NAME (arg)); else return -1; if (!strcmp (str, "box")) return FILLED_BOX_CURSOR; if (!strcmp (str, "hollow")) return HOLLOW_BOX_CURSOR; @@ -1493,12 +1490,12 @@ Lisp_Object fname; NSString *promptS = NILP (prompt) || !STRINGP (prompt) ? nil : - [NSString stringWithUTF8String: SDATA (prompt)]; + [NSString stringWithUTF8String: SSDATA (prompt)]; NSString *dirS = NILP (dir) || !STRINGP (dir) ? - [NSString stringWithUTF8String: SDATA (BVAR (current_buffer, directory))] : - [NSString stringWithUTF8String: SDATA (dir)]; + [NSString stringWithUTF8String: SSDATA (BVAR (current_buffer, directory))] : + [NSString stringWithUTF8String: SSDATA (dir)]; NSString *initS = NILP (init) || !STRINGP (init) ? nil : - [NSString stringWithUTF8String: SDATA (init)]; + [NSString stringWithUTF8String: SSDATA (init)]; check_ns (); @@ -1568,9 +1565,9 @@ if (NILP (owner)) owner = build_string([ns_app_name UTF8String]); CHECK_STRING (name); -/*fprintf (stderr, "ns-get-resource checking resource '%s'\n", SDATA (name)); */ +/*fprintf (stderr, "ns-get-resource checking resource '%s'\n", SSDATA (name)); */ - value = ns_get_defaults_value (SDATA (name)); + value = ns_get_defaults_value (SSDATA (name)); if (value) return build_string (value); @@ -1591,15 +1588,15 @@ if (NILP (value)) { [[NSUserDefaults standardUserDefaults] removeObjectForKey: - [NSString stringWithUTF8String: SDATA (name)]]; + [NSString stringWithUTF8String: SSDATA (name)]]; } else { CHECK_STRING (value); [[NSUserDefaults standardUserDefaults] setObject: - [NSString stringWithUTF8String: SDATA (value)] + [NSString stringWithUTF8String: SSDATA (value)] forKey: [NSString stringWithUTF8String: - SDATA (name)]]; + SSDATA (name)]]; } return Qnil; @@ -1795,10 +1792,10 @@ { if (!NILP (must_succeed)) fatal ("OpenStep on %s not responding.\n", - SDATA (display)); + SSDATA (display)); else error ("OpenStep on %s not responding.\n", - SDATA (display)); + SSDATA (display)); } /* Register our external input/output types, used for determining @@ -1897,14 +1894,14 @@ { char *nm; CHECK_STRING (name); - nm = SDATA (name); + nm = SSDATA (name); if (nm[0] != '-') return name; if (strstr (nm, "fontset") && !strstr (nm, "fontset-startup")) return name; - return build_string (ns_xlfd_to_fontname (SDATA (name))); + return build_string (ns_xlfd_to_fontname (SSDATA (name))); } @@ -1927,14 +1924,14 @@ BLOCK_INPUT; colorlists = [[NSColorList availableColorLists] objectEnumerator]; - while (clist = [colorlists nextObject]) + while ((clist = [colorlists nextObject])) { if ([[clist name] length] < 7 || [[clist name] rangeOfString: @"PANTONE"].location == 0) { NSEnumerator *cnames = [[clist allKeys] reverseObjectEnumerator]; NSString *cname; - while (cname = [cnames nextObject]) + while ((cname = [cnames nextObject])) list = Fcons (build_string ([cname UTF8String]), list); /* for (i = [[clist allKeys] count] - 1; i >= 0; i--) list = Fcons (build_string ([[[clist allKeys] objectAtIndex: i] @@ -2014,12 +2011,11 @@ id pb; NSString *svcName; char *utfStr; - int len; CHECK_STRING (service); check_ns (); - utfStr = SDATA (service); + utfStr = SSDATA (service); svcName = [NSString stringWithUTF8String: utfStr]; pb =[NSPasteboard pasteboardWithUniqueName]; @@ -2044,7 +2040,7 @@ NSString *utfStr; CHECK_STRING (str); - utfStr = [NSString stringWithUTF8String: SDATA (str)]; + utfStr = [NSString stringWithUTF8String: SSDATA (str)]; if (![utfStr respondsToSelector: @selector (precomposedStringWithCanonicalMapping)]) { @@ -2074,7 +2070,7 @@ NSAppleScript* scriptObject = [[NSAppleScript alloc] initWithSource: - [NSString stringWithUTF8String: SDATA (script)]]; + [NSString stringWithUTF8String: SSDATA (script)]]; returnDescriptor = [scriptObject executeAndReturnError: &errorDict]; [scriptObject release]; @@ -2173,7 +2169,7 @@ else if (!STRINGP (result)) error ("AppleScript error %d", status); else - error ("%s", SDATA (result)); + error ("%s", SSDATA (result)); } #endif @@ -2400,7 +2396,6 @@ that stands for the selected frame's display. */) (Lisp_Object display) { - int top; NSScreen *screen; NSRect vScreen; @@ -2558,7 +2553,7 @@ GCPRO4 (string, parms, frame, timeout); CHECK_STRING (string); - str = SDATA (string); + str = SSDATA (string); f = check_x_frame (frame); if (NILP (timeout)) timeout = make_number (5); @@ -2692,8 +2687,6 @@ void syms_of_nsfns (void) { - int i; - Qfontsize = intern_c_string ("fontsize"); staticpro (&Qfontsize); === modified file 'src/nsfont.m' --- src/nsfont.m 2012-07-13 01:37:11 +0000 +++ src/nsfont.m 2012-07-13 18:03:10 +0000 @@ -100,7 +100,7 @@ return nil; else { - char *tmp = xstrdup (SDATA (SYMBOL_NAME (tem))); + char *tmp = xstrdup (SSDATA (SYMBOL_NAME (tem))); NSString *family; ns_unescape_name (tmp); family = [NSString stringWithUTF8String: tmp]; @@ -293,13 +293,13 @@ static NSString *ns_lang_to_script (Lisp_Object lang) { - if (!strcmp (SDATA (SYMBOL_NAME (lang)), "ja")) + if (!strcmp (SSDATA (SYMBOL_NAME (lang)), "ja")) return @"han"; /* NOTE: ja given for any hanzi that's also a kanji, but Chinese fonts have more characters. */ - else if (!strcmp (SDATA (SYMBOL_NAME (lang)), "zh")) + else if (!strcmp (SSDATA (SYMBOL_NAME (lang)), "zh")) return @"han"; - else if (!strcmp (SDATA (SYMBOL_NAME (lang)), "ko")) + else if (!strcmp (SSDATA (SYMBOL_NAME (lang)), "ko")) return @"hangul"; else return @""; @@ -313,7 +313,7 @@ { Lisp_Object script = assq_no_quit (XCAR (otf), Votf_script_alist); return CONSP (script) - ? [NSString stringWithUTF8String: SDATA (SYMBOL_NAME (XCDR ((script))))] + ? [NSString stringWithUTF8String: SSDATA (SYMBOL_NAME (XCDR ((script))))] : @""; } @@ -326,10 +326,10 @@ while CONSP (rts) { r = XCAR (XCAR (rts)); - if (!strncmp(SDATA(r), reg, strlen(SDATA(r)))) + if (!strncmp(SSDATA(r), reg, strlen(SSDATA(r)))) { script = XCDR (XCAR (rts)); - return [NSString stringWithUTF8String: SDATA (SYMBOL_NAME (script))]; + return [NSString stringWithUTF8String: SSDATA (SYMBOL_NAME (script))]; } rts = XCDR (rts); } @@ -355,7 +355,7 @@ Lisp_Object key = XCAR (tmp), val = XCDR (tmp); if (EQ (key, QCscript) && SYMBOLP (val)) return [NSString stringWithUTF8String: - SDATA (SYMBOL_NAME (val))]; + SSDATA (SYMBOL_NAME (val))]; if (EQ (key, QClang) && SYMBOLP (val)) return ns_lang_to_script (val); if (EQ (key, QCotf) && CONSP (val) && SYMBOLP (XCAR (val))) @@ -373,7 +373,7 @@ if (EQ (reg, Qiso10646_1)) reg = Qiso8859_1; #endif - return ns_registry_to_script (SDATA (SYMBOL_NAME (reg))); + return ns_registry_to_script (SSDATA (SYMBOL_NAME (reg))); } return @""; @@ -464,7 +464,7 @@ while (1) { NSEnumerator *allFamiliesEnum = [allFamilies objectEnumerator]; - while (family = [allFamiliesEnum nextObject]) + while ((family = [allFamiliesEnum nextObject])) { NSCharacterSet *fset = [[fontMgr fontWithFamily: family traits: 0 weight: 5 size: 12.0] coveredCharacterSet]; @@ -528,7 +528,7 @@ NSLog(@"Got desc %@ and found %d matching fonts from it: ", fdesc, [matchingDescs count]); - for (dEnum = [matchingDescs objectEnumerator]; desc = [dEnum nextObject]; ) + for (dEnum = [matchingDescs objectEnumerator]; (desc = [dEnum nextObject]);) { if (![cFamilies containsObject: [desc objectForKey: NSFontFamilyAttribute]]) @@ -664,7 +664,7 @@ [[[NSFontManager sharedFontManager] availableFontFamilies] objectEnumerator]; NSString *family; - while (family = [families nextObject]) + while ((family = [families nextObject])) list = Fcons (intern ([family UTF8String]), list); /* FIXME: escape the name? */ @@ -692,7 +692,6 @@ Lisp_Object tem; NSRect brect; Lisp_Object font_object; - int i; int fixLeopardBug; static NSMutableDictionary *fontCache = nil; NSNumber *cached; @@ -719,7 +718,7 @@ } tem = AREF (font_entity, FONT_ADSTYLE_INDEX); - synthItal = !NILP (tem) && !strncmp ("synthItal", SDATA (SYMBOL_NAME (tem)), + synthItal = !NILP (tem) && !strncmp ("synthItal", SSDATA (SYMBOL_NAME (tem)), 9); family = ns_get_family (font_entity); if (family == nil) @@ -812,7 +811,6 @@ { const char *fontName = [[nsfont fontName] UTF8String]; - int len = strlen (fontName); /* The values specified by fonts are not always exact. For * example, a 6x8 font could specify that the descender is @@ -1060,7 +1058,6 @@ NS to render the string, it will come out differently from the individual character widths added up because of layout processing. */ { - XCharStruct *cs; int cwidth, twidth = 0; int hi, lo; /* FIXME: composition: no vertical displacement is considered. */ === modified file 'src/nsimage.m' --- src/nsimage.m 2012-01-19 07:21:25 +0000 +++ src/nsimage.m 2012-07-13 18:03:10 +0000 @@ -96,7 +96,7 @@ { NSData *data; - data = [NSData dataWithBytes: SDATA (spec_data) + data = [NSData dataWithBytes: SSDATA (spec_data) length: SBYTES (spec_data)]; eImg = [[EmacsImage alloc] initWithData: data]; [eImg setPixmapData]; @@ -171,7 +171,7 @@ /* look for an existing image of the same name */ while (image != nil && - [[image name] compare: [NSString stringWithUTF8String: SDATA (file)]] + [[image name] compare: [NSString stringWithUTF8String: SSDATA (file)]] != NSOrderedSame) image = [image imageListNext]; @@ -187,7 +187,7 @@ return nil; image = [[EmacsImage alloc] initByReferencingFile: - [NSString stringWithUTF8String: SDATA (found)]]; + [NSString stringWithUTF8String: SSDATA (found)]]; #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 imgRep = [NSBitmapImageRep imageRepWithData:[image TIFFRepresentation]]; @@ -205,7 +205,7 @@ [image setScalesWhenResized: YES]; [image setSize: NSMakeSize([imgRep pixelsWide], [imgRep pixelsHigh])]; - [image setName: [NSString stringWithUTF8String: SDATA (file)]]; + [image setName: [NSString stringWithUTF8String: SSDATA (file)]]; [image reference]; ImageList = [image imageListSetNext: ImageList]; @@ -334,7 +334,6 @@ - setXBMColor: (NSColor *)color { NSSize s = [self size]; - int len = (int) s.width * s.height; unsigned char *planes[5]; CGFloat r, g, b, a; NSColor *rgbColor; @@ -400,7 +399,7 @@ NSImageRep *rep; reps = [[self representations] objectEnumerator]; - while (rep = (NSImageRep *) [reps nextObject]) + while ((rep = (NSImageRep *) [reps nextObject])) { if ([rep respondsToSelector: @selector (getBitmapDataPlanes:)]) { === modified file 'src/nsmenu.m' --- src/nsmenu.m 2012-07-13 17:07:02 +0000 +++ src/nsmenu.m 2012-07-13 18:03:10 +0000 @@ -249,7 +249,7 @@ /* FIXME: we'd like to only parse the needed submenu, but this was causing crashes in the _common parsing code.. need to make sure proper initialization done.. */ -/* if (submenu && strcmp (submenuTitle, SDATA (string))) +/* if (submenu && strcmp (submenuTitle, SSDATA (string))) continue; */ submenu_start[i] = menu_items_used; @@ -318,8 +318,8 @@ if (!EQ (previous_items[i], AREF (menu_items, i))) if (!(STRINGP (previous_items[i]) && STRINGP (AREF (menu_items, i)) - && !strcmp (SDATA (previous_items[i]), - SDATA (AREF (menu_items, i))))) + && !strcmp (SSDATA (previous_items[i]), + SSDATA (AREF (menu_items, i))))) break; if (i == previous_menu_items_used) { @@ -356,7 +356,7 @@ string = AREF (items, i + 1); if (NILP (string)) break; -/* if (submenu && strcmp (submenuTitle, SDATA (string))) +/* if (submenu && strcmp (submenuTitle, SSDATA (string))) continue; */ wv->name = SSDATA (string); @@ -422,11 +422,13 @@ if (EQ (string, make_number (0))) // FIXME: Why??? --Stef continue; if (NILP (string)) - if (previous_strings[i][0]) - break; - else - continue; - if (memcmp (previous_strings[i], SDATA (string), + { + if (previous_strings[i][0]) + break; + else + continue; + } + else if (memcmp (previous_strings[i], SDATA (string), min (10, SBYTES (string) + 1))) break; } @@ -528,7 +530,7 @@ /* override designated initializer */ - initWithTitle: (NSString *)title { - if (self = [super initWithTitle: title]) + if ((self = [super initWithTitle: title])) [self setAutoenablesItems: NO]; return self; } @@ -793,7 +795,7 @@ { EmacsMenu *pmenu; NSPoint p; - Lisp_Object window, tem, keymap; + Lisp_Object tem; ptrdiff_t specpdl_count = SPECPDL_INDEX (); widget_value *wv, *first_wv = 0; @@ -990,7 +992,7 @@ } pmenu = [[EmacsMenu alloc] initWithTitle: - [NSString stringWithUTF8String: SDATA (title)]]; + [NSString stringWithUTF8String: SSDATA (title)]]; [pmenu fillWithWidgetValue: first_wv->contents]; free_menubar_widget_value_tree (first_wv); unbind_to (specpdl_count, Qnil); @@ -1043,7 +1045,6 @@ i * TOOL_BAR_ITEM_NSLOTS + (IDX)) BOOL enabled_p = !NILP (TOOLPROP (TOOL_BAR_ITEM_ENABLED_P)); - BOOL selected_p = !NILP (TOOLPROP (TOOL_BAR_ITEM_SELECTED_P)); int idx; ptrdiff_t img_id; struct image *img; @@ -1473,7 +1474,6 @@ { NSSize spacing = {SPACER, SPACER}; NSRect area; - char this_cmd_name[80]; id cell; static NSImageView *imgView; static FlippedView *contentView; @@ -1581,11 +1581,11 @@ item = XCAR (list); if (XTYPE (item) == Lisp_String) { - [window addString: SDATA (item) row: row++]; + [window addString: SSDATA (item) row: row++]; } else if (XTYPE (item) == Lisp_Cons) { - [window addButton: SDATA (XCAR (item)) + [window addButton: SSDATA (XCAR (item)) value: XCDR (item) row: row++]; } else if (NILP (item)) @@ -1675,7 +1675,7 @@ if (XTYPE (head) == Lisp_String) [title setStringValue: - [NSString stringWithUTF8String: SDATA (head)]]; + [NSString stringWithUTF8String: SSDATA (head)]]; else if (isQ == YES) [title setStringValue: @"Question"]; else === modified file 'src/nsterm.h' --- src/nsterm.h 2012-07-10 01:04:28 +0000 +++ src/nsterm.h 2012-07-13 18:03:10 +0000 @@ -89,7 +89,7 @@ } /* AppKit-side interface */ -- menuDown: sender; +- menuDown: (id)sender; - toolbarClicked: (id)item; - toggleToolbar: (id)sender; - (void)keyDown: (NSEvent *)theEvent; @@ -535,7 +535,7 @@ extern struct ns_display_info *x_display_list; extern Lisp_Object ns_display_name_list; -extern struct ns_display_info *ns_display_info_for_name (); +extern struct ns_display_info *ns_display_info_for_name (Lisp_Object name); struct ns_display_info *check_x_display_info (Lisp_Object frame); FRAME_PTR check_x_frame (Lisp_Object frame); @@ -697,7 +697,7 @@ (! (FRAME_HAS_VERTICAL_SCROLL_BARS_ON_LEFT (f)) ? 0 \ : FRAME_SCROLL_BAR_COLS (f)) -extern struct ns_display_info *ns_term_init (); +extern struct ns_display_info *ns_term_init (Lisp_Object display_name); extern void ns_term_shutdown (int sig); /* constants for text rendering */ @@ -725,13 +725,15 @@ extern const char *ns_xlfd_to_fontname (const char *xlfd); extern void check_ns (void); -extern Lisp_Object ns_map_event_to_object (); -extern Lisp_Object ns_string_from_pasteboard (); -extern void ns_string_to_pasteboard (); +extern Lisp_Object ns_map_event_to_object (void); +#ifdef __OBJC__ +extern Lisp_Object ns_string_from_pasteboard (id pb); +extern void ns_string_to_pasteboard (id pb, Lisp_Object str); +#endif extern Lisp_Object ns_get_local_selection (Lisp_Object selection_name, Lisp_Object target_type); -extern void nxatoms_of_nsselect (); -extern int ns_lisp_to_cursor_type (); +extern void nxatoms_of_nsselect (void); +extern int ns_lisp_to_cursor_type (Lisp_Object arg); extern Lisp_Object ns_cursor_type_to_lisp (int arg); extern Lisp_Object Qnone; extern void ns_set_name_as_filename (struct frame *f); @@ -756,9 +758,9 @@ /* C access to ObjC functionality */ extern void ns_release_object (void *obj); extern void ns_retain_object (void *obj); -extern void *ns_alloc_autorelease_pool (); -extern void ns_release_autorelease_pool (); -extern const char *ns_get_defaults_value (); +extern void *ns_alloc_autorelease_pool (void); +extern void ns_release_autorelease_pool (void *); +extern const char *ns_get_defaults_value (const char *key); /* in nsmenu */ extern void update_frame_tool_bar (FRAME_PTR f); @@ -794,6 +796,7 @@ extern void x_activate_menubar (struct frame *); extern void free_frame_menubar (struct frame *); extern void x_free_frame_resources (struct frame *); +extern void x_destroy_window (struct frame *); #define NSAPP_DATA2_RUNASSCRIPT 10 extern void ns_run_ascript (void); === modified file 'src/nsterm.m' --- src/nsterm.m 2012-07-12 16:58:37 +0000 +++ src/nsterm.m 2012-07-13 18:03:10 +0000 @@ -169,7 +169,9 @@ static struct frame *ns_updating_frame; static NSView *focus_view = NULL; static int ns_window_num = 0; +#ifdef NS_IMPL_GNUSTEP static NSRect uRect; +#endif static BOOL gsaved = NO; BOOL ns_in_resize = NO; static BOOL ns_fake_keydown = NO; @@ -347,7 +349,7 @@ pathEnum = [paths objectEnumerator]; resourcePaths = @""; - while (resourcePath = [pathEnum nextObject]) + while ((resourcePath = [pathEnum nextObject])) { if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir]) if (isDir) @@ -387,7 +389,7 @@ /* Hack to skip site-lisp. */ if (no_site_lisp) resourcePath = [pathEnum nextObject]; - while (resourcePath = [pathEnum nextObject]) + while ((resourcePath = [pathEnum nextObject])) { if ([fileManager fileExistsAtPath: resourcePath isDirectory: &isDir]) if (isDir) @@ -1111,7 +1113,7 @@ NSView *view = FRAME_NS_VIEW (f); struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (f); Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); - NSTRACE (x_destroy_window); + NSTRACE (x_free_frame_resources); check_ns (); [(EmacsView *)view setWindowClosing: YES]; /* may not have been informed */ @@ -1218,7 +1220,6 @@ -------------------------------------------------------------------------- */ { EmacsView *view = FRAME_NS_VIEW (f); - EmacsToolbar *toolbar = [view toolbar]; NSWindow *window = [view window]; NSRect wr = [window frame]; int tb = FRAME_EXTERNAL_TOOL_BAR (f); @@ -1503,21 +1504,6 @@ } -static NSColor * -ns_get_color_default (const char *name, NSColor *dflt) -/* -------------------------------------------------------------------------- - Parse a color or use a default value - -------------------------------------------------------------------------- */ -{ - NSColor * col; - - if (ns_get_color (name, &col)) - return dflt; - else - return col; -} - - int ns_lisp_to_color (Lisp_Object color, NSColor **col) /* -------------------------------------------------------------------------- @@ -1526,9 +1512,9 @@ { NSTRACE (ns_lisp_to_color); if (STRINGP (color)) - return ns_get_color (SDATA (color), col); + return ns_get_color (SSDATA (color), col); else if (SYMBOLP (color)) - return ns_get_color (SDATA (SYMBOL_NAME (color)), col); + return ns_get_color (SSDATA (SYMBOL_NAME (color)), col); return 1; } @@ -1773,7 +1759,6 @@ { id view; NSPoint position; - int xchar, ychar; Lisp_Object frame, tail; struct frame *f; struct ns_display_info *dpyinfo; @@ -1867,7 +1852,7 @@ } -void +static void ns_define_frame_cursor (struct frame *f, Cursor cursor) /* -------------------------------------------------------------------------- External (RIF): set frame mouse pointer type. @@ -1992,7 +1977,7 @@ } -void +static void ns_clear_frame_area (struct frame *f, int x, int y, int width, int height) /* -------------------------------------------------------------------------- External (RIF): Clear section of frame @@ -2195,8 +2180,7 @@ External (RIF); compute left/right overhang of whole string and set in s -------------------------------------------------------------------------- */ { - struct face *face = FACE_FROM_ID (s->f, s->first_glyph->face_id); - struct font *font = s->font; /*face->font; */ + struct font *font = s->font; if (s->char2b) { @@ -2313,7 +2297,7 @@ } -void +static void ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row, int x, int y, int cursor_type, int cursor_width, int on_p, int active_p) @@ -3627,7 +3611,6 @@ BOOL barOnVeryLeft, barOnVeryRight; int top, left, height, width, sb_width, sb_left; EmacsScroller *bar; -static int count = 0; /* optimization; display engine sends WAY too many of these.. */ if (!NILP (window->vertical_scroll_bar)) @@ -3809,43 +3792,23 @@ Convert modifier name to lisp symbol -------------------------------------------------------------------------- */ { - if (!strncmp (SDATA (SYMBOL_NAME (Qmeta)), s, 10)) + if (!strncmp (SSDATA (SYMBOL_NAME (Qmeta)), s, 10)) return Qmeta; - else if (!strncmp (SDATA (SYMBOL_NAME (Qsuper)), s, 10)) + else if (!strncmp (SSDATA (SYMBOL_NAME (Qsuper)), s, 10)) return Qsuper; - else if (!strncmp (SDATA (SYMBOL_NAME (Qcontrol)), s, 10)) + else if (!strncmp (SSDATA (SYMBOL_NAME (Qcontrol)), s, 10)) return Qcontrol; - else if (!strncmp (SDATA (SYMBOL_NAME (Qalt)), s, 10)) + else if (!strncmp (SSDATA (SYMBOL_NAME (Qalt)), s, 10)) return Qalt; - else if (!strncmp (SDATA (SYMBOL_NAME (Qhyper)), s, 10)) + else if (!strncmp (SSDATA (SYMBOL_NAME (Qhyper)), s, 10)) return Qhyper; - else if (!strncmp (SDATA (SYMBOL_NAME (Qnone)), s, 10)) + else if (!strncmp (SSDATA (SYMBOL_NAME (Qnone)), s, 10)) return Qnone; else return Qnil; } -static Lisp_Object ns_mod_to_lisp (int m) -/* -------------------------------------------------------------------------- - Convert modifier code (see lisp.h) to lisp symbol - -------------------------------------------------------------------------- */ -{ - if (m == CHAR_META) - return Qmeta; - else if (m == CHAR_SUPER) - return Qsuper; - else if (m == CHAR_CTL) - return Qcontrol; - else if (m == CHAR_ALT) - return Qalt; - else if (m == CHAR_HYPER) - return Qhyper; - else /* if (m == 0) */ - return Qnone; -} - - static void ns_default (const char *parameter, Lisp_Object *result, Lisp_Object yesval, Lisp_Object noval, @@ -3874,7 +3837,7 @@ } -void +static void ns_initialize_display_info (struct ns_display_info *dpyinfo) /* -------------------------------------------------------------------------- Initialize global info and storage for display. @@ -3963,7 +3926,6 @@ ns_delete_terminal (struct terminal *terminal) { struct ns_display_info *dpyinfo = terminal->display_info.ns; - int i; /* Protect against recursive calls. delete_frame in delete_terminal calls us back when it deletes our last frame. */ @@ -4124,7 +4086,6 @@ if ( cl == nil ) { Lisp_Object color_file, color_map, color; - int r,g,b; unsigned long c; char *name; @@ -4141,7 +4102,7 @@ for ( ; CONSP (color_map); color_map = XCDR (color_map)) { color = XCAR (color_map); - name = SDATA (XCAR (color)); + name = SSDATA (XCAR (color)); c = XINT (XCDR (color)); [cl setColor: [NSColor colorWithCalibratedRed: RED_FROM_ULONG (c) / 255.0 @@ -4253,7 +4214,7 @@ /* code not reached in emacs.c after this is called by shut_down_emacs: */ if (STRINGP (Vauto_save_list_file_name)) - unlink (SDATA (Vauto_save_list_file_name)); + unlink (SSDATA (Vauto_save_list_file_name)); if (sig == 0 || sig == SIGTERM) { @@ -4600,7 +4561,7 @@ { [ns_pending_service_names addObject: userData]; [ns_pending_service_args addObject: [NSString stringWithUTF8String: - SDATA (ns_string_from_pasteboard (pboard))]]; + SSDATA (ns_string_from_pasteboard (pboard))]]; } @@ -4664,8 +4625,8 @@ if (!emacs_event) return; - if (newFont = [sender convertFont: - ((struct nsfont_info *)face->font)->nsfont]) + if ((newFont = [sender convertFont: + ((struct nsfont_info *)face->font)->nsfont])) { SET_FRAME_GARBAGED (emacsframe); /* now needed as of 2008/10 */ @@ -5141,7 +5102,6 @@ - (void)mouseDown: (NSEvent *)theEvent { NSPoint p = [self convertPoint: [theEvent locationInWindow] fromView: nil]; - Lisp_Object window; NSTRACE (mouseDown); @@ -5371,9 +5331,9 @@ - (void)windowDidResize: (NSNotification *)notification { +#ifdef NS_IMPL_GNUSTEP NSWindow *theWindow = [notification object]; -#ifdef NS_IMPL_GNUSTEP /* in GNUstep, at least currently, it's possible to get a didResize without getting a willResize.. therefore we need to act as if we got the willResize now */ @@ -5493,7 +5453,6 @@ Lisp_Object tem; NSWindow *win; NSButton *toggleButton; - int vbextra = NS_SCROLL_BAR_WIDTH (f); NSSize sz; NSColor *col; NSString *name; @@ -5546,7 +5505,7 @@ tem = f->name; name = [NSString stringWithUTF8String: - NILP (tem) ? (unsigned char *)"Emacs" : SDATA (tem)]; + NILP (tem) ? "Emacs" : SSDATA (tem)]; [win setTitle: name]; /* toolbar support */ @@ -5565,7 +5524,7 @@ tem = f->icon_name; if (!NILP (tem)) [win setMiniwindowTitle: - [NSString stringWithUTF8String: SDATA (tem)]]; + [NSString stringWithUTF8String: SSDATA (tem)]]; { NSScreen *screen = [win screen]; @@ -5710,18 +5669,13 @@ - (void)mouseEntered: (NSEvent *)theEvent { - NSPoint p = [self convertPoint: [theEvent locationInWindow] fromView: nil]; - struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (emacsframe); NSTRACE (mouseEntered); - last_mouse_movement_time = EV_TIMESTAMP (theEvent); } - (void)mouseExited: (NSEvent *)theEvent { - NSPoint p = [self convertPoint: [theEvent locationInWindow] fromView: nil]; - NSRect r; Mouse_HLInfo *hlinfo = emacsframe ? MOUSE_HL_INFO (emacsframe) : NULL; NSTRACE (mouseExited); @@ -5744,10 +5698,14 @@ NSTRACE (menuDown); if (context_menu_value == -1) context_menu_value = [sender tag]; - else - find_and_call_menu_selection (emacsframe, emacsframe->menu_bar_items_used, - emacsframe->menu_bar_vector, - (void *)[sender tag]); + else + { + NSInteger tag = [sender tag]; + find_and_call_menu_selection (emacsframe, emacsframe->menu_bar_items_used, + emacsframe->menu_bar_vector, + (void *)tag); + } + ns_send_appdefined (-1); return self; } ------------------------------------------------------------ revno: 109077 fixes bug(s): http://debbugs.gnu.org/11907 committer: Jan D. branch nick: trunk timestamp: Fri 2012-07-13 19:07:02 +0200 message: * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to memcpy. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 12:20:07 +0000 +++ src/ChangeLog 2012-07-13 17:07:02 +0000 @@ -1,3 +1,8 @@ +2012-07-13 Jan Djärv + + * nsmenu.m (ns_update_menubar): Exchange place of argument 2 and 3 to + memcpy (Bug#11907). + 2012-07-13 Kalle Kankare (tiny change) * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo === modified file 'src/nsmenu.m' --- src/nsmenu.m 2012-07-10 21:48:34 +0000 +++ src/nsmenu.m 2012-07-13 17:07:02 +0000 @@ -448,8 +448,8 @@ break; if (n < 100) - memcpy (previous_strings[i/4], min (10, SBYTES (string) + 1), - SDATA (string)); + memcpy (previous_strings[i/4], SDATA (string), + min (10, SBYTES (string) + 1)); wv = xmalloc_widget_value (); wv->name = SSDATA (string); ------------------------------------------------------------ revno: 109076 committer: Juanma Barranquero branch nick: trunk timestamp: Fri 2012-07-13 19:02:18 +0200 message: lisp/bindings.el (top): Use `mapc' instead of `mapcar'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-13 16:50:21 +0000 +++ lisp/ChangeLog 2012-07-13 17:02:18 +0000 @@ -1,5 +1,7 @@ 2012-07-13 Juanma Barranquero + * bindings.el (top): Use `mapc' instead of `mapcar'. + * loadup.el (top): Remove bogus `if' choice (brought by revno:88805). 2012-07-13 Michael Albinus === modified file 'lisp/bindings.el' --- lisp/bindings.el 2012-07-13 14:25:59 +0000 +++ lisp/bindings.el 2012-07-13 17:02:18 +0000 @@ -657,14 +657,14 @@ ;; For consistency, we give them the `permanent-local' property, even ;; though `kill-all-local-variables' does not actually consult it. -(mapcar (lambda (sym) (put sym 'permanent-local t)) - '(buffer-file-name default-directory buffer-backed-up - buffer-saved-size buffer-auto-save-file-name - buffer-read-only buffer-undo-list mark-active - point-before-scroll buffer-file-truename - buffer-file-format buffer-auto-save-file-format - buffer-display-count buffer-display-time - enable-multibyte-characters)) +(mapc (lambda (sym) (put sym 'permanent-local t)) + '(buffer-file-name default-directory buffer-backed-up + buffer-saved-size buffer-auto-save-file-name + buffer-read-only buffer-undo-list mark-active + point-before-scroll buffer-file-truename + buffer-file-format buffer-auto-save-file-format + buffer-display-count buffer-display-time + enable-multibyte-characters)) ;; We have base64, md5 and sha1 functions built in now. (provide 'base64) ------------------------------------------------------------ revno: 109075 committer: Juanma Barranquero branch nick: trunk timestamp: Fri 2012-07-13 18:50:21 +0200 message: lisp/loadup.el (top): Remove bogus `if' choice (brought by revno:88805). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-13 14:58:12 +0000 +++ lisp/ChangeLog 2012-07-13 16:50:21 +0000 @@ -1,3 +1,7 @@ +2012-07-13 Juanma Barranquero + + * loadup.el (top): Remove bogus `if' choice (brought by revno:88805). + 2012-07-13 Michael Albinus * progmodes/sql.el (sql-comint): Suppress the check for program on === modified file 'lisp/loadup.el' --- lisp/loadup.el 2012-07-06 07:23:25 +0000 +++ lisp/loadup.el 2012-07-13 16:50:21 +0000 @@ -374,9 +374,7 @@ (if (or (member (nth 3 command-line-args) '("dump" "bootstrap")) (member (nth 4 command-line-args) '("dump" "bootstrap"))) (progn - (if (memq system-type '(ms-dos windows-nt cygwin)) - (message "Dumping under the name emacs") - (message "Dumping under the name emacs")) + (message "Dumping under the name emacs") (condition-case () (delete-file "emacs") (file-error nil)) ------------------------------------------------------------ revno: 109074 committer: Michael Albinus branch nick: trunk timestamp: Fri 2012-07-13 16:58:12 +0200 message: * progmodes/sql.el (sql-comint): Suppress the check for program on remote hosts. Reported by Francis Devereux . (Bug#11908) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-13 14:25:59 +0000 +++ lisp/ChangeLog 2012-07-13 14:58:12 +0000 @@ -1,3 +1,9 @@ +2012-07-13 Michael Albinus + + * progmodes/sql.el (sql-comint): Suppress the check for program on + remote hosts. Reported by Francis Devereux . + (Bug#11908) + 2012-07-13 Chong Yidong * bindings.el: Assign a non-nil permanent-local property to @@ -375,12 +381,12 @@ `git-registered'. (vc-git-mode-line-string): Call `vc-working-revision' instead of `vc-git-working-revision' in order to benefit from the cache. - (vc-git-root): Use cache property `git-root'. + (vc-git-root): Use cache property `git-root'. (Bug#11757) 2012-06-30 Dmitry Gutov * vc/vc-hooks.el (vc-before-save): Clear cache if file has been - removed (likely outside Emacs). + removed (likely outside Emacs). (Bug#11757) 2012-06-30 Stefan Monnier === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2012-03-01 05:01:22 +0000 +++ lisp/progmodes/sql.el 2012-07-13 14:58:12 +0000 @@ -2856,7 +2856,7 @@ (defun sql-get-login-ext (symbol prompt history-var plist) "Prompt user with extended login parameters. -The global value of SYMBOL is the last value and the global value +The global value of SYMBOL is the last value and the global value of the SYMBOL is set based on the user's input. If PLIST is nil, then the user is simply prompted for a string @@ -2871,7 +2871,7 @@ The `:completion' property prompts for a string specified by its value. (The property value is used as the PREDICATE argument to `completing-read'.)" - (set-default + (set-default symbol (let* ((default (plist-get plist :default)) (last-value (default-value symbol)) @@ -4146,10 +4146,12 @@ passed as command line arguments." (let ((program (sql-get-product-feature product :sqli-program)) (buf-name "SQL")) - ;; make sure we can find the program - (unless (executable-find program) + ;; Make sure we can find the program. `executable-find' does not + ;; work for remote hosts; we suppress the check there. + (unless (or (file-remote-p default-directory) + (executable-find program)) (error "Unable to locate SQL program \'%s\'" program)) - ;; Make sure buffer name is unique + ;; Make sure buffer name is unique. (when (sql-buffer-live-p (format "*%s*" buf-name)) (setq buf-name (format "SQL-%s" product)) (when (sql-buffer-live-p (format "*%s*" buf-name)) ------------------------------------------------------------ revno: 109073 fixes bug(s): http://debbugs.gnu.org/11930 committer: Chong Yidong branch nick: trunk timestamp: Fri 2012-07-13 22:25:59 +0800 message: Give permanent-local property to per-buffer variables without defaults. * doc/emacs/custom.texi (Examining): Update C-h v message. * lisp/bindings.el: Assign a non-nil permanent-local property to per-buffer variables which lack a default value. * lisp/help-fns.el (describe-variable): In the "automatically becomes local" notice, take note of permanent-local variables. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-07-13 07:06:09 +0000 +++ doc/emacs/ChangeLog 2012-07-13 14:25:59 +0000 @@ -1,5 +1,7 @@ 2012-07-13 Chong Yidong + * custom.texi (Examining): Update C-h v message. + * buffers.texi (Misc Buffer): Document view-read-only. 2012-07-07 Chong Yidong === modified file 'doc/emacs/custom.texi' --- doc/emacs/custom.texi 2012-07-07 09:51:59 +0000 +++ doc/emacs/custom.texi 2012-07-13 14:25:59 +0000 @@ -766,7 +766,7 @@ fill-column is a variable defined in `C source code'. fill-column's value is 70 -Automatically becomes buffer-local when set in any fashion. +Automatically becomes buffer-local when set. This variable is safe as a file local variable if its value satisfies the predicate `integerp'. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-13 07:06:09 +0000 +++ lisp/ChangeLog 2012-07-13 14:25:59 +0000 @@ -1,5 +1,13 @@ 2012-07-13 Chong Yidong + * bindings.el: Assign a non-nil permanent-local property to + per-buffer variables which lack a default value (Bug#11930). + + * help-fns.el (describe-variable): In the "automatically becomes + local" notice, take note of permanent-local variables. + +2012-07-13 Chong Yidong + * files.el (toggle-read-only): Doc fix and code cleanup. New arg to allow printing the message when called from Lisp. === modified file 'lisp/bindings.el' --- lisp/bindings.el 2012-07-13 07:06:09 +0000 +++ lisp/bindings.el 2012-07-13 14:25:59 +0000 @@ -650,9 +650,22 @@ user-error ;; That's the main one! )) - (make-variable-buffer-local 'indent-tabs-mode) +;; These per-buffer variables are never reset by +;; `kill-all-local-variables', because they have no default value. +;; For consistency, we give them the `permanent-local' property, even +;; though `kill-all-local-variables' does not actually consult it. + +(mapcar (lambda (sym) (put sym 'permanent-local t)) + '(buffer-file-name default-directory buffer-backed-up + buffer-saved-size buffer-auto-save-file-name + buffer-read-only buffer-undo-list mark-active + point-before-scroll buffer-file-truename + buffer-file-format buffer-auto-save-file-format + buffer-display-count buffer-display-time + enable-multibyte-characters)) + ;; We have base64, md5 and sha1 functions built in now. (provide 'base64) (provide 'md5) === modified file 'lisp/help-fns.el' --- lisp/help-fns.el 2012-07-03 07:12:22 +0000 +++ lisp/help-fns.el 2012-07-13 14:25:59 +0000 @@ -852,7 +852,10 @@ (with-temp-buffer (local-variable-if-set-p variable)))) (setq extra-line t) - (princ " Automatically becomes buffer-local when set in any fashion.\n")) + (princ " Automatically becomes ") + (if (get variable 'permanent-local) + (princ "permanently ")) + (princ "buffer-local when set.\n")) ;; Mention if it's an alias (unless (eq alias variable) ------------------------------------------------------------ revno: 109072 fixes bug(s): http://debbugs.gnu.org/11558 committer: Jan D. branch nick: trunk timestamp: Fri 2012-07-13 14:20:07 +0200 message: * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo and free it with DestroyExceptionInfo. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 11:49:26 +0000 +++ src/ChangeLog 2012-07-13 12:20:07 +0000 @@ -1,3 +1,8 @@ +2012-07-13 Kalle Kankare (tiny change) + + * image.c (Fimagemagick_types): Initialize ex with GetExceptionInfo + and free it with DestroyExceptionInfo (Bug#11558). + 2012-07-13 Juanma Barranquero * s/ms-w32.h (FIRST_PTY_LETTER, HAVE_SOCKETS): Move to nt/config.nt. === modified file 'src/image.c' --- src/image.c 2012-07-10 23:24:36 +0000 +++ src/image.c 2012-07-13 12:20:07 +0000 @@ -7968,9 +7968,14 @@ Lisp_Object typelist = Qnil; size_t numf = 0; ExceptionInfo ex; - char **imtypes = GetMagickList ("*", &numf, &ex); + char **imtypes; size_t i; Lisp_Object Qimagemagicktype; + + GetExceptionInfo(&ex); + imtypes = GetMagickList ("*", &numf, &ex); + DestroyExceptionInfo(&ex); + for (i = 0; i < numf; i++) { Qimagemagicktype = intern (imtypes[i]); ------------------------------------------------------------ revno: 109071 committer: Juanma Barranquero branch nick: trunk timestamp: Fri 2012-07-13 13:49:26 +0200 message: * nt/config.nt: Sync with autogen/config.in. (BROKEN_FIONREAD, BROKEN_GET_CURRENT_DIR_NAME) (BROKEN_PTY_READ_AFTER_EAGAIN, BROKEN_SIGAIO, BROKEN_SIGPOLL) (BROKEN_SIGPTY, BSD4_2, BSD_SYSTEM, BSD_SYSTEM_AHB, CYGWIN, DARWIN_OS) (FIRST_PTY_LETTER, GNU_LINUX, G_SLICE_ALWAYS_MALLOC, HAVE_PTYS) (HAVE_SOCKETS, HPUX, INTERRUPT_INPUT, IRIX6_5, NARROWPROTO, NO_ABORT) (NO_EDITRES, NSIG_MINIMUM, PREFER_VSUSP, PTY_ITERATION (PTY_NAME_SPRINTF, PTY_OPEN, PTY_TTY_NAME_SPRINTF, RUN_TIME_REMAP) (SETPGRP_RELEASES_CTTY, SOLARIS2, TAB3, TABDLY, ULIMIT_BREAK_VALUE) (UNIX98_PTYS, USG, USG5, XOS_NEEDS_TIME_H, _AIX): New macros. (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE___BUILTIN_UNWIND_INIT): Set in src/s/ms-w32.h, not here. * src/s/ms-w32.h (FIRST_PTY_LETTER, HAVE_SOCKETS): Move to nt/config.nt. (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE___BUILTIN_UNWIND_INIT): Set here, not in nt/config.nt. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-07-11 11:44:31 +0000 +++ nt/ChangeLog 2012-07-13 11:49:26 +0000 @@ -1,3 +1,18 @@ +2012-07-13 Juanma Barranquero + + * config.nt: Sync with autogen/config.in. + (BROKEN_FIONREAD, BROKEN_GET_CURRENT_DIR_NAME) + (BROKEN_PTY_READ_AFTER_EAGAIN, BROKEN_SIGAIO, BROKEN_SIGPOLL) + (BROKEN_SIGPTY, BSD4_2, BSD_SYSTEM, BSD_SYSTEM_AHB, CYGWIN, DARWIN_OS) + (FIRST_PTY_LETTER, GNU_LINUX, G_SLICE_ALWAYS_MALLOC, HAVE_PTYS) + (HAVE_SOCKETS, HPUX, INTERRUPT_INPUT, IRIX6_5, NARROWPROTO, NO_ABORT) + (NO_EDITRES, NSIG_MINIMUM, PREFER_VSUSP, PTY_ITERATION + (PTY_NAME_SPRINTF, PTY_OPEN, PTY_TTY_NAME_SPRINTF, RUN_TIME_REMAP) + (SETPGRP_RELEASES_CTTY, SOLARIS2, TAB3, TABDLY, ULIMIT_BREAK_VALUE) + (UNIX98_PTYS, USG, USG5, XOS_NEEDS_TIME_H, _AIX): New macros. + (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE___BUILTIN_UNWIND_INIT): + Set in src/s/ms-w32.h, not here. + 2012-07-11 Juanma Barranquero * config.nt: Sync with autogen/config.in. === modified file 'nt/config.nt' --- nt/config.nt 2012-07-11 11:44:31 +0000 +++ nt/config.nt 2012-07-13 11:49:26 +0000 @@ -51,12 +51,39 @@ /* Define to the number of bits in type 'wint_t'. */ #undef BITSIZEOF_WINT_T +/* Define if FIONREAD should not be used. */ +#undef BROKEN_FIONREAD + +/* Define if get_current_dir_name should not be used. */ +#undef BROKEN_GET_CURRENT_DIR_NAME + +/* Define on FreeBSD to work around an issue when reading from a PTY. */ +#undef BROKEN_PTY_READ_AFTER_EAGAIN + /* Define if SA_RESTART should only be used in batch mode. */ #undef BROKEN_SA_RESTART +/* Define if SIGAIO should not be used. */ +#undef BROKEN_SIGAIO + /* Define if SIGIO should not be used. */ #undef BROKEN_SIGIO +/* Define if SIGPOLL should not be used. */ +#undef BROKEN_SIGPOLL + +/* Define if SIGPTY should not be used. */ +#undef BROKEN_SIGPTY + +/* Define if the system is compatible with BSD 4.2. */ +#undef BSD4_2 + +/* Define if the system is compatible with BSD 4.2. */ +#undef BSD_SYSTEM + +/* Define if AH_BOTTOM should change BSD_SYSTEM. */ +#undef BSD_SYSTEM_AHB + /* Define if Emacs cannot be dumped on your system. */ #undef CANNOT_DUMP @@ -73,9 +100,15 @@ */ #undef CRAY_STACKSEG_END +/* Define if the system is Cygwin. */ +#undef CYGWIN + /* Define to 1 if using 'alloca.c'. */ #undef C_ALLOCA +/* Define if the system is Darwin. */ +#undef DARWIN_OS + /* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */ #undef DATA_SEG_BITS @@ -106,6 +139,10 @@ enabled. */ #undef ENABLE_CHECKING +/* Letter to use in finding device name of first PTY, if PTYs are supported. + */ +#define FIRST_PTY_LETTER 'a' + /* Define to 1 if futimesat mishandles a NULL file name. */ #undef FUTIMESAT_NULL_BUG @@ -150,9 +187,16 @@ /* Value of PENDING_OUTPUT_COUNT if using the GNU C library. */ #undef GNU_LIBRARY_PENDING_OUTPUT_COUNT +/* Define if ths system is compatible with GNU/Linux. */ +#undef GNU_LINUX + /* Define to 1 if you want to use the GNU memory allocator. */ #define GNU_MALLOC 1 +/* Define to set the G_SLICE environment variable to "always-malloc" at + startup, if using GTK. */ +#undef G_SLICE_ALWAYS_MALLOC + /* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */ #undef HAVE_AIX_SMT_EXP @@ -679,6 +723,9 @@ /* Define to 1 if the pthread_sigmask function can be used (despite bugs). */ #undef HAVE_PTHREAD_SIGMASK +/* Define if the system supports pty devices. */ +#undef HAVE_PTYS + /* Define to 1 if you have the header file. */ #undef HAVE_PTY_H @@ -745,6 +792,10 @@ /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 +/* Define if the system supports 4.2-compatible sockets. + NT supports Winsock which is close enough (with some hacks). */ +#define HAVE_SOCKETS 1 + /* Define to 1 if you have sound support. */ #define HAVE_SOUND 1 @@ -1031,6 +1082,15 @@ /* Define to support using a Hesiod database to find the POP server. */ #undef HESIOD +/* Define if the system is HPUX. */ +#undef HPUX + +/* Define to read input using SIGIO. */ +#undef INTERRUPT_INPUT + +/* Define if the system is IRIX. */ +#undef IRIX6_5 + /* Define to support Kerberos-authenticated POP mail retrieval. */ #undef KERBEROS @@ -1062,6 +1122,16 @@ /* Define to support POP mail retrieval. */ #define MAIL_USE_POP 1 +/* Define if system's imake configuration file defines `NeedWidePrototypes' as + `NO'. */ +#undef NARROWPROTO + +/* Do not define abort in emacs.c. */ +#undef NO_ABORT + +/* Define if XEditRes should not be used. */ +#undef NO_EDITRES + /* Define to 1 if you don't have struct exception in math.h. */ #define NO_MATHERR 1 @@ -1071,6 +1141,9 @@ /* Define if termio.h should not be included. */ #undef NO_TERMIO +/* Minimum value of NSIG. */ +#undef NSIG_MINIMUM + /* Define to 1 if `NSInteger' is defined. */ #undef NS_HAVE_NSINTEGER @@ -1115,6 +1188,9 @@ png_longjmp. */ #undef PNG_DEPSTRUCT +/* Define if process_send_signal should use VSUSP instead of VSWTCH. */ +#undef PREFER_VSUSP + /* Define to 1 if pthread_sigmask(), when it fails, returns -1 and sets errno. */ #undef PTHREAD_SIGMASK_FAILS_WITH_ERRNO @@ -1129,6 +1205,18 @@ 'ptrdiff_t'. */ #undef PTRDIFF_T_SUFFIX +/* How to iterate over PTYs. */ +#undef PTY_ITERATION + +/* How to get the device name of the control end of a PTY, if non-standard. */ +#undef PTY_NAME_SPRINTF + +/* How to open a PTY, if non-standard. */ +#undef PTY_OPEN + +/* How to get device name of the tty end of a PTY, if non-standard. */ +#undef PTY_TTY_NAME_SPRINTF + /* Define to 1 if readlink fails to recognize a trailing slash. */ #undef READLINK_TRAILING_SLASH_BUG @@ -1144,6 +1232,12 @@ slash */ #undef REPLACE_FUNC_STAT_FILE +/* Define if emacs.c needs to call run_time_remap; for HPUX. */ +#undef RUN_TIME_REMAP + +/* Define if process.c:child_setup should not call setpgrp. */ +#undef SETPGRP_RELEASES_CTTY + /* Make process_send_signal work by "typing" a signal character on the pty. */ #undef SIGNALS_VIA_CHARACTERS @@ -1155,6 +1249,9 @@ 'size_t'. */ #undef SIZE_T_SUFFIX +/* Define if the system is Solaris. */ +#undef SOLARIS2 + /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. @@ -1181,6 +1278,12 @@ /* The type of system you are compiling for; sets `system-type'. */ #define SYSTEM_TYPE "windows-nt" +/* Undocumented. */ +#undef TAB3 + +/* Undocumented. */ +#undef TABDLY + /* Define to 1 if you use terminfo instead of termcap. */ #undef TERMINFO @@ -1194,6 +1297,9 @@ timespec. */ #undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC +/* Undocumented. */ +#undef ULIMIT_BREAK_VALUE + /* Define to 1 for Encore UMAX. */ #undef UMAX @@ -1201,6 +1307,9 @@ . */ #undef UMAX4_3 +/* Define if the system has Unix98 PTYs. */ +#undef UNIX98_PTYS + /* Define to 1 if using GTK. */ #undef USE_GTK @@ -1222,6 +1331,12 @@ /* Define to 1 if using an X toolkit. */ #undef USE_X_TOOLKIT +/* Define if the system is compatible with System III. */ +#undef USG + +/* Define if the system is compatible with System V. */ +#undef USG5 + /* Define for USG systems where it works to open a pty's tty in the parent process, then close and reopen it in the child. */ #undef USG_SUBTTY_WORKS @@ -1255,10 +1370,16 @@ /* Define this to check for malloc buffer overrun. */ #undef XMALLOC_OVERRUN_CHECK +/* Compensate for a bug in Xos.h on some systems, where it requires time.h. */ +#undef XOS_NEEDS_TIME_H + /* Define to the type of the 6th arg of XRegisterIMInstantiateCallback, either XPointer or XPointer*. */ #undef XRegisterIMInstantiateCallback_arg6 +/* Define if the system is AIX. */ +#undef _AIX + /* Enable large inode numbers on Mac OS X. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 @@ -1458,6 +1579,19 @@ #endif #endif +/* This silences a few compilation warnings on FreeBSD. */ +#ifdef BSD_SYSTEM_AHB +#undef BSD_SYSTEM_AHB +#undef BSD_SYSTEM +#if __FreeBSD__ == 1 +#define BSD_SYSTEM 199103 +#elif __FreeBSD__ == 2 +#define BSD_SYSTEM 199306 +#elif __FreeBSD__ >= 3 +#define BSD_SYSTEM 199506 +#endif +#endif + /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ #undef AMPERSAND_FULL_NAME @@ -1475,13 +1609,14 @@ # include config_opsysfile #endif -/* GNUstep needs a bit more pure memory. Of the existing knobs, - SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. - (There is probably a better place to do this, but right now the - Cocoa side does this in s/darwin.h and we cannot parallel this - exactly since GNUstep is multi-OS. */ -#if defined HAVE_NS && defined NS_IMPL_GNUSTEP +/* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs, + SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ +#ifdef HAVE_NS +#if defined NS_IMPL_GNUSTEP # define SYSTEM_PURESIZE_EXTRA 30000 +#elif defined DARWIN_OS +# define SYSTEM_PURESIZE_EXTRA 200000 +#endif #endif #ifdef emacs /* Don't do this for lib-src. */ @@ -1542,20 +1677,6 @@ # endif #endif -/* Define to 1 if GCC-style __attribute__ ((__aligned__ (expr))) works. */ -#ifdef __GNUC__ -#define HAVE_ATTRIBUTE_ALIGNED 1 -#endif - -/* Define to 1 if strtold conforms to C99. */ -#ifdef __GNUC__ -#define HAVE_C99_STRTOLD 1 -#endif - -#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) -#define HAVE___BUILTIN_UNWIND_INIT 1 -#endif - #endif /* EMACS_CONFIG_H */ /* === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 10:11:37 +0000 +++ src/ChangeLog 2012-07-13 11:49:26 +0000 @@ -1,3 +1,9 @@ +2012-07-13 Juanma Barranquero + + * s/ms-w32.h (FIRST_PTY_LETTER, HAVE_SOCKETS): Move to nt/config.nt. + (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE___BUILTIN_UNWIND_INIT): + Set here, not in nt/config.nt. + 2012-07-13 Eli Zaretskii * xdisp.c (move_it_in_display_line_to): On GUI terminals, allow === modified file 'src/s/ms-w32.h' --- src/s/ms-w32.h 2012-07-07 00:20:56 +0000 +++ src/s/ms-w32.h 2012-07-13 11:49:26 +0000 @@ -38,17 +38,10 @@ convention must be whatever standard the libraries expect. */ #define _CALLBACK_ __cdecl -/* Letter to use in finding device name of first pty, - if system supports pty's. 'a' means it is /dev/ptya0 */ -#define FIRST_PTY_LETTER 'a' - /* Define HAVE_TIMEVAL if the system supports the BSD style clock values. Look in for a timeval structure. */ #define HAVE_TIMEVAL 1 -/* NT supports Winsock which is close enough (with some hacks). */ -#define HAVE_SOCKETS 1 - /* But our select implementation doesn't allow us to make non-blocking connects. So until that is fixed, this is necessary: */ #define BROKEN_NON_BLOCKING_CONNECT 1 @@ -70,6 +63,20 @@ is not ':', #define this to be the appropriate character constant. */ #define SEPCHAR ';' +/* Define to 1 if GCC-style __attribute__ ((__aligned__ (expr))) works. */ +#ifdef __GNUC__ +#define HAVE_ATTRIBUTE_ALIGNED 1 +#endif + +/* Define to 1 if strtold conforms to C99. */ +#ifdef __GNUC__ +#define HAVE_C99_STRTOLD 1 +#endif + +#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)) +#define HAVE___BUILTIN_UNWIND_INIT 1 +#endif + /* ============================================================ */ /* Here, add any special hacks needed to make Emacs work on this ------------------------------------------------------------ revno: 109070 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-07-13 06:17:28 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2012-07-12 10:17:28 +0000 +++ autogen/config.in 2012-07-13 10:17:28 +0000 @@ -70,6 +70,15 @@ /* Define if SIGPTY should not be used. */ #undef BROKEN_SIGPTY +/* Define if the system is compatible with BSD 4.2. */ +#undef BSD4_2 + +/* Define if the system is compatible with BSD 4.2. */ +#undef BSD_SYSTEM + +/* Define if AH_BOTTOM should change BSD_SYSTEM. */ +#undef BSD_SYSTEM_AHB + /* Define if Emacs cannot be dumped on your system. */ #undef CANNOT_DUMP @@ -86,9 +95,15 @@ */ #undef CRAY_STACKSEG_END +/* Define if the system is Cygwin. */ +#undef CYGWIN + /* Define to 1 if using 'alloca.c'. */ #undef C_ALLOCA +/* Define if the system is Darwin. */ +#undef DARWIN_OS + /* Extra bits to be or'd in with any pointers stored in a Lisp_Object. */ #undef DATA_SEG_BITS @@ -167,6 +182,9 @@ /* Value of PENDING_OUTPUT_COUNT if using the GNU C library. */ #undef GNU_LIBRARY_PENDING_OUTPUT_COUNT +/* Define if ths system is compatible with GNU/Linux. */ +#undef GNU_LINUX + /* Define to 1 if you want to use the GNU memory allocator. */ #undef GNU_MALLOC @@ -1055,9 +1073,15 @@ /* Define to support using a Hesiod database to find the POP server. */ #undef HESIOD +/* Define if the system is HPUX. */ +#undef HPUX + /* Define to read input using SIGIO. */ #undef INTERRUPT_INPUT +/* Define if the system is IRIX. */ +#undef IRIX6_5 + /* Define to support Kerberos-authenticated POP mail retrieval. */ #undef KERBEROS @@ -1096,6 +1120,9 @@ /* Do not define abort in emacs.c. */ #undef NO_ABORT +/* Define if XEditRes should not be used. */ +#undef NO_EDITRES + /* Define to 1 if you don't have struct exception in math.h. */ #undef NO_MATHERR @@ -1105,6 +1132,9 @@ /* Define if termio.h should not be included. */ #undef NO_TERMIO +/* Minimum value of NSIG. */ +#undef NSIG_MINIMUM + /* Define to 1 if `NSInteger' is defined. */ #undef NS_HAVE_NSINTEGER @@ -1210,6 +1240,9 @@ 'size_t'. */ #undef SIZE_T_SUFFIX +/* Define if the system is Solaris. */ +#undef SOLARIS2 + /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be automatically deduced at runtime. @@ -1255,6 +1288,9 @@ timespec. */ #undef TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC +/* Undocumented. */ +#undef ULIMIT_BREAK_VALUE + /* Define to 1 for Encore UMAX. */ #undef UMAX @@ -1262,6 +1298,9 @@ . */ #undef UMAX4_3 +/* Define if the system has Unix98 PTYs. */ +#undef UNIX98_PTYS + /* Define to 1 if using GTK. */ #undef USE_GTK @@ -1283,6 +1322,12 @@ /* Define to 1 if using an X toolkit. */ #undef USE_X_TOOLKIT +/* Define if the system is compatible with System III. */ +#undef USG + +/* Define if the system is compatible with System V. */ +#undef USG5 + /* Define for USG systems where it works to open a pty's tty in the parent process, then close and reopen it in the child. */ #undef USG_SUBTTY_WORKS @@ -1323,6 +1368,9 @@ XPointer or XPointer*. */ #undef XRegisterIMInstantiateCallback_arg6 +/* Define if the system is AIX. */ +#undef _AIX + /* Enable large inode numbers on Mac OS X. */ #ifndef _DARWIN_USE_64_BIT_INODE # define _DARWIN_USE_64_BIT_INODE 1 @@ -1520,6 +1568,19 @@ # error "alloca not available on this machine" #endif +/* This silences a few compilation warnings on FreeBSD. */ +#ifdef BSD_SYSTEM_AHB +#undef BSD_SYSTEM_AHB +#undef BSD_SYSTEM +#if __FreeBSD__ == 1 +#define BSD_SYSTEM 199103 +#elif __FreeBSD__ == 2 +#define BSD_SYSTEM 199306 +#elif __FreeBSD__ >= 3 +#define BSD_SYSTEM 199506 +#endif +#endif + /* Define AMPERSAND_FULL_NAME if you use the convention that & in the full name stands for the login id. */ /* Turned on June 1996 supposing nobody will mind it. */ @@ -1538,13 +1599,14 @@ # include config_opsysfile #endif -/* GNUstep needs a bit more pure memory. Of the existing knobs, - SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. - (There is probably a better place to do this, but right now the - Cocoa side does this in s/darwin.h and we cannot parallel this - exactly since GNUstep is multi-OS. */ -#if defined HAVE_NS && defined NS_IMPL_GNUSTEP +/* Mac OS X / GNUstep need a bit more pure memory. Of the existing knobs, + SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems. */ +#ifdef HAVE_NS +#if defined NS_IMPL_GNUSTEP # define SYSTEM_PURESIZE_EXTRA 30000 +#elif defined DARWIN_OS +# define SYSTEM_PURESIZE_EXTRA 200000 +#endif #endif #ifdef emacs /* Don't do this for lib-src. */ === modified file 'autogen/configure' --- autogen/configure 2012-07-12 10:17:28 +0000 +++ autogen/configure 2012-07-13 10:17:28 +0000 @@ -19243,7 +19243,7 @@ fi test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS" -fi + fi LIBXMU=-lXmu @@ -22634,12 +22634,35 @@ + + +case $opsys in + aix4-2) + if test x$ac_cv_lib_Xmu_XmuConvertStandardSelection != xyes; then + $as_echo "#define NO_EDITRES 1" >>confdefs.h + + fi + ;; + + hpux*) + $as_echo "#define NO_EDITRES 1" >>confdefs.h + + ;; +esac + + case $opsys in darwin | gnu | hpux* | *bsd ) $as_echo "#define NO_TERMIO 1" >>confdefs.h - ;; + ;; + + irix6-5 | sol2* | unixware ) + +$as_echo "#define NSIG_MINIMUM 32" >>confdefs.h + + ;; esac @@ -22775,6 +22798,9 @@ gnu-linux | gnu-kfreebsd ) if test "x$ac_cv_func_grantpt" = xyes; then + +$as_echo "#define UNIX98_PTYS 1" >>confdefs.h + $as_echo "#define PTY_ITERATION int i; for (i = 0; i < 1; i++) " >>confdefs.h $as_echo "#define PTY_TTY_NAME_SPRINTF { char *ptyname; sigblock (sigmask (SIGCHLD)); if (grantpt (fd) == -1 || unlockpt (fd) == -1 || !(ptyname = ptsname(fd))) { sigunblock (sigmask (SIGCHLD)); close (fd); return -1; } snprintf (pty_name, sizeof pty_name, \"%s\", ptyname); sigunblock (sigmask (SIGCHLD)); } " >>confdefs.h @@ -22996,6 +23022,7 @@ + case $opsys in darwin) $as_echo "#define TAB3 OXTABS" >>confdefs.h ;; @@ -23008,11 +23035,39 @@ ;; + gnu-linux | gnu-kfreebsd ) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifndef __i386__ +# error "not i386" +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + $as_echo "#define ULIMIT_BREAK_VALUE (32*1024*1024)" >>confdefs.h + +fi +rm -f conftest.err conftest.$ac_ext + ;; + hpux*) $as_echo "#define RUN_TIME_REMAP 1" >>confdefs.h ;; + + irix6-5) + $as_echo "#define ULIMIT_BREAK_VALUE 0x14000000" >>confdefs.h + + ;; esac @@ -23025,6 +23080,141 @@ esac + + + + + +case $opsys in + aix4-2) + $as_echo "#define USG /**/" >>confdefs.h + + $as_echo "#define USG5 /**/" >>confdefs.h + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifndef _AIX +# error "_AIX not defined" +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + +$as_echo "#define _AIX /**/" >>confdefs.h + +fi +rm -f conftest.err conftest.$ac_ext + ;; + + cygwin) + opsysfile= + +$as_echo "#define CYGWIN 1" >>confdefs.h + + ;; + + darwin) + $as_echo "#define BSD4_2 /**/" >>confdefs.h + + $as_echo "#define BSD_SYSTEM /**/" >>confdefs.h + + +$as_echo "#define DARWIN_OS /**/" >>confdefs.h + + ;; + + freebsd) + $as_echo "#define BSD4_2 /**/" >>confdefs.h + + +$as_echo "#define BSD_SYSTEM_AHB 1" >>confdefs.h + + ;; + + gnu | netbsd | openbsd ) + $as_echo "#define BSD4_2 /**/" >>confdefs.h + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifndef BSD_SYSTEM +# error "BSD_SYSTEM not defined" +#endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + +else + $as_echo "#define BSD_SYSTEM 43" >>confdefs.h + +fi +rm -f conftest.err conftest.$ac_ext + ;; + + gnu-linux | gnu-kfreebsd ) + $as_echo "#define USG /**/" >>confdefs.h + + +$as_echo "#define GNU_LINUX /**/" >>confdefs.h + + ;; + + hpux*) + $as_echo "#define USG /**/" >>confdefs.h + + $as_echo "#define USG5 /**/" >>confdefs.h + + +$as_echo "#define HPUX /**/" >>confdefs.h + + ;; + + irix6-5) + $as_echo "#define USG /**/" >>confdefs.h + + $as_echo "#define USG5 /**/" >>confdefs.h + + +$as_echo "#define IRIX6_5 /**/" >>confdefs.h + + ;; + + sol2*) + $as_echo "#define USG /**/" >>confdefs.h + + $as_echo "#define USG5 /**/" >>confdefs.h + + +$as_echo "#define SOLARIS2 /**/" >>confdefs.h + + ;; + + unixware) + $as_echo "#define USG /**/" >>confdefs.h + + $as_echo "#define USG5 /**/" >>confdefs.h + + ;; +esac + + case $opsys in cygwin) @@ -23032,7 +23222,7 @@ ;; - gnu) opsysfile="s/bsd-common.h" ;; + gnu) opsysfile= ;; gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;; ------------------------------------------------------------ revno: 109069 fixes bug(s): http://debbugs.gnu.org/11832 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2012-07-13 13:11:37 +0300 message: Fix bs-show when the right fringe is off. src/xdisp.c (move_it_in_display_line_to): On GUI terminals, allow cursor overflow into the last glyph on display line when the right fringe is off. (Bug#11832) diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 03:50:58 +0000 +++ src/ChangeLog 2012-07-13 10:11:37 +0000 @@ -1,3 +1,9 @@ +2012-07-13 Eli Zaretskii + + * xdisp.c (move_it_in_display_line_to): On GUI terminals, allow + cursor overflow into the last glyph on display line when the right + fringe is off. (Bug#11832) + 2012-07-13 Paul Eggert * xdisp.c (produce_special_glyphs): Now static. === modified file 'src/xdisp.c' --- src/xdisp.c 2012-07-13 03:50:58 +0000 +++ src/xdisp.c 2012-07-13 10:11:37 +0000 @@ -8381,10 +8381,15 @@ /* On graphical terminals, newlines may "overflow" into the fringe if overflow-newline-into-fringe is non-nil. - On text terminals, newlines may overflow - into the last glyph on the display - line.*/ + On text terminals, and on graphical + terminals with no right margin, newlines + may overflow into the last glyph on the + display line.*/ if (!FRAME_WINDOW_P (it->f) + || ((it->bidi_p + && it->bidi_it.paragraph_dir == R2L) + ? WINDOW_LEFT_FRINGE_WIDTH (it->w) + : WINDOW_RIGHT_FRINGE_WIDTH (it->w)) == 0 || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)) { if (!get_next_display_element (it)) @@ -8518,7 +8523,7 @@ if (!FRAME_WINDOW_P (it->f) || ((it->bidi_p && it->bidi_it.paragraph_dir == R2L) ? WINDOW_LEFT_FRINGE_WIDTH (it->w) - : WINDOW_RIGHT_FRINGE_WIDTH (it->w)) + : WINDOW_RIGHT_FRINGE_WIDTH (it->w)) == 0 || IT_OVERFLOW_NEWLINE_INTO_FRINGE (it)) { int at_eob_p = 0; ------------------------------------------------------------ revno: 109068 committer: Chong Yidong branch nick: trunk timestamp: Fri 2012-07-13 15:06:09 +0800 message: Don't warn on toggle-read-only calls. Clarify the documentation of toggle-read-only, and audit the code tree for uses of toggle-read-only; where appropriate, switch to setting the variable buffer-read-only or calling toggle-read-only with a (new) second arg. * lisp/files.el (toggle-read-only): Doc fix and code cleanup. New arg to allow printing the message when called from Lisp. * lisp/emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions): Remove toggle-read-only. * lisp/bindings.el (mode-line-toggle-read-only): * lisp/dired.el (dired-toggle-read-only): * lisp/ibuffer.el (ibuffer-do-toggle-read-only): Call toggle-read-only with non-nil second arg. * lisp/bs.el (bs-toggle-readonly): * lisp/buff-menu.el (Buffer-menu-toggle-read-only): Remove with-no-warnings around toggle-read-only. * lisp/ffap.el (ffap--toggle-read-only): Accept a list of buffers. Remove with-no-warnings around toggle-read-only. (ffap-read-only, ffap-read-only-other-window) (ffap-read-only-other-frame): Callers changed. * lisp/help-mode.el: Don't require view package. (help-mode-finish): Set buffer-read-only instead of calling toggle-read-only. * lisp/emacs-lisp/eieio-custom.el (eieio-customize-object): * lisp/vc/ediff.el (ediff-set-read-only-in-buf-A): Set buffer-read-only directly. * lisp/gnus/smime.el (smime-certificate-info): Set buffer-read-only directly, instead of calling toggle-read-only with a (bogus) argument. * doc/emacs/buffers.texi (Misc Buffer): Document view-read-only. * doc/lispref/buffers.texi (Read Only Buffers): Document toggle-read-only changes. Reword to account for the fact that read-only is currently not supported in overlay properties. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-07-07 09:51:59 +0000 +++ doc/emacs/ChangeLog 2012-07-13 07:06:09 +0000 @@ -1,3 +1,7 @@ +2012-07-13 Chong Yidong + + * buffers.texi (Misc Buffer): Document view-read-only. + 2012-07-07 Chong Yidong * custom.texi (Init File): Index site-lisp (Bug#11435). === modified file 'doc/emacs/buffers.texi' --- doc/emacs/buffers.texi 2012-05-27 01:25:06 +0000 +++ doc/emacs/buffers.texi 2012-07-13 07:06:09 +0000 @@ -232,11 +232,14 @@ whose access control says you cannot write it. @findex toggle-read-only +@vindex view-read-only The command @kbd{C-x C-q} (@code{toggle-read-only}) makes a read-only buffer writable, and makes a writable buffer read-only. This works by setting the variable @code{buffer-read-only}, which has a local value in each buffer and makes the buffer read-only if its value is -non-@code{nil}. +non-@code{nil}. If you change the option @code{view-read-only} to a +non-@code{nil} value, making the buffer read-only with @kbd{C-x C-q} +also enables View mode in the buffer (@pxref{View Mode}). @findex rename-buffer @kbd{M-x rename-buffer} changes the name of the current buffer. You === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-07-07 09:51:59 +0000 +++ doc/lispref/ChangeLog 2012-07-13 07:06:09 +0000 @@ -1,3 +1,9 @@ +2012-07-13 Chong Yidong + + * buffers.texi (Read Only Buffers): Document toggle-read-only + changes. Reword to account for the fact that read-only is + currently not supported in overlay properties. + 2012-07-07 Chong Yidong * loading.texi (Library Search): Index site-lisp directories. === modified file 'doc/lispref/buffers.texi' --- doc/lispref/buffers.texi 2012-05-27 01:34:14 +0000 +++ doc/lispref/buffers.texi 2012-07-13 07:06:09 +0000 @@ -730,11 +730,9 @@ @defvar inhibit-read-only If this variable is non-@code{nil}, then read-only buffers and, depending on the actual value, some or all read-only characters may be -modified. Read-only characters in a buffer are those that have -non-@code{nil} @code{read-only} properties (either text properties or -overlay properties). @xref{Special Properties}, for more information -about text properties. @xref{Overlays}, for more information about -overlays and their properties. +modified. Read-only characters in a buffer are those that have a +non-@code{nil} @code{read-only} text property. @xref{Special +Properties}, for more information about text properties. If @code{inhibit-read-only} is @code{t}, all @code{read-only} character properties have no effect. If @code{inhibit-read-only} is a list, then @@ -742,18 +740,31 @@ of the list (comparison is done with @code{eq}). @end defvar -@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 (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 -the numeric value of that prefix argument is positive and to -@code{nil} otherwise. @xref{Prefix Command Arguments}. +@deffn Command toggle-read-only &optional arg message +This command toggles whether the current buffer is read-only, by +setting the variable @code{buffer-read-only}. If @var{arg} is +non-@code{nil}, it should be a raw prefix argument; the command then +makes the buffer read-only if the numeric value of that prefix +argument is positive, and makes the buffer writable otherwise. +@xref{Prefix Command Arguments}. + +If called interactively, or if called from Lisp with @var{message} is +non-@code{nil}, the command prints a message reporting the buffer's +new read-only status. + +When making the buffer read-only, this command also enables View mode +if the option @code{view-read-only} is non-@code{nil}. @xref{Misc +Buffer,,Miscellaneous Buffer Operations, emacs, The GNU Emacs Manual}. +When making the buffer writable, it disables View mode if View mode +was enabled. + +Lisp programs should only call @code{toggle-read-only} if they really +intend to do the same thing as the user command, including possibly +enabling or disabling View mode. Note also that this command works by +setting @code{buffer-read-only}, so even if you make the buffer +writable, characters with non-@code{nil} @code{read-only} text +properties will remain read-only. To temporarily ignore all read-only +states, bind @code{inhibit-read-only}, as described above. @end deffn @defun barf-if-buffer-read-only === modified file 'etc/NEWS' --- etc/NEWS 2012-07-11 17:42:24 +0000 +++ etc/NEWS 2012-07-13 07:06:09 +0000 @@ -476,6 +476,9 @@ * Lisp changes in Emacs 24.2 +** `toggle-read-only' accepts a second argument specifying whether to +print a message, if called from Lisp. + ** CL-style generalized variables are now in core Elisp. `setf' is autoloaded and `push' and `pop' accept generalized variables. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-12 11:33:55 +0000 +++ lisp/ChangeLog 2012-07-13 07:06:09 +0000 @@ -1,3 +1,33 @@ +2012-07-13 Chong Yidong + + * files.el (toggle-read-only): Doc fix and code cleanup. New arg + to allow printing the message when called from Lisp. + + * emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions): + Remove toggle-read-only. + + * bs.el (bs-toggle-readonly): + * buff-menu.el (Buffer-menu-toggle-read-only): Remove + with-no-warnings around toggle-read-only. + + * ffap.el (ffap--toggle-read-only): Accept a list of buffers. + Remove with-no-warnings around toggle-read-only. + (ffap-read-only, ffap-read-only-other-window) + (ffap-read-only-other-frame): Callers changed. + + * help-mode.el: Don't require view package. + (help-mode-finish): Set buffer-read-only instead of calling + toggle-read-only. + + * bindings.el (mode-line-toggle-read-only): + * dired.el (dired-toggle-read-only): + * ibuffer.el (ibuffer-do-toggle-read-only): Call toggle-read-only + with non-nil second arg. + + * emacs-lisp/eieio-custom.el (eieio-customize-object): + * vc/ediff.el (ediff-set-read-only-in-buf-A): Set buffer-read-only + directly. + 2012-07-12 Eli Zaretskii * emacs-lisp/bytecomp.el (byte-recompile-directory): Use cl-incf, === modified file 'lisp/bindings.el' --- lisp/bindings.el 2012-06-27 21:15:13 +0000 +++ lisp/bindings.el 2012-07-13 07:06:09 +0000 @@ -40,7 +40,7 @@ (interactive "e") (save-selected-window (select-window (posn-window (event-start event))) - (with-no-warnings (toggle-read-only)) + (toggle-read-only nil t) (force-mode-line-update))) (defun mode-line-toggle-modified (event) === modified file 'lisp/bs.el' --- lisp/bs.el 2012-07-10 11:51:54 +0000 +++ lisp/bs.el 2012-07-13 07:06:09 +0000 @@ -962,7 +962,7 @@ Uses function `toggle-read-only'." (interactive) (with-current-buffer (bs--current-buffer) - (call-interactively 'toggle-read-only)) + (toggle-read-only)) (bs--update-current-line)) (defun bs-clear-modified () === modified file 'lisp/buff-menu.el' --- lisp/buff-menu.el 2012-06-27 21:15:13 +0000 +++ lisp/buff-menu.el 2012-07-13 07:06:09 +0000 @@ -515,11 +515,12 @@ (bury-buffer menu))) (defun Buffer-menu-toggle-read-only () - "Toggle read-only status of buffer on this line." + "Toggle read-only status of buffer on this line. +This behaves like invoking \\[toggle-read-only] in that buffer." (interactive) (let (read-only) (with-current-buffer (Buffer-menu-buffer t) - (with-no-warnings (toggle-read-only)) + (toggle-read-only) (setq read-only buffer-read-only)) (tabulated-list-set-col 1 (if read-only "%" " ") t))) === modified file 'lisp/dired.el' --- lisp/dired.el 2012-07-10 11:51:54 +0000 +++ lisp/dired.el 2012-07-13 07:06:09 +0000 @@ -1956,15 +1956,14 @@ Actual changes in files cannot be undone by Emacs.")) (defun dired-toggle-read-only () - "Edit dired buffer with Wdired, or set it read-only. -Call `wdired-change-to-wdired-mode' in dired buffers whose editing is -supported by Wdired (the major mode of the dired buffer is `dired-mode'). -Otherwise, for buffers inheriting from dired-mode, call `toggle-read-only'." + "Edit Dired buffer with Wdired, or make it read-only. +If the current buffer can be edited with Wdired, (i.e. the major +mode is `dired-mode'), call `wdired-change-to-wdired-mode'. +Otherwise, call `toggle-read-only'." (interactive) (if (eq major-mode 'dired-mode) (wdired-change-to-wdired-mode) - (with-no-warnings - (toggle-read-only)))) + (toggle-read-only nil t))) (defun dired-next-line (arg) "Move down lines then position at filename. === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2012-07-12 11:33:55 +0000 +++ lisp/emacs-lisp/bytecomp.el 2012-07-13 07:06:09 +0000 @@ -355,7 +355,7 @@ (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 toggle-read-only) + goto-line comint-run delete-backward-char) "List of commands that are not meant to be called from Lisp.") (defvar byte-compile-not-obsolete-vars nil === modified file 'lisp/emacs-lisp/eieio-custom.el' --- lisp/emacs-lisp/eieio-custom.el 2012-01-19 07:21:25 +0000 +++ lisp/emacs-lisp/eieio-custom.el 2012-07-13 07:06:09 +0000 @@ -345,7 +345,7 @@ (concat "*CUSTOMIZE " (object-name obj) " " (symbol-name g) "*"))) - (toggle-read-only -1) + (setq buffer-read-only nil) (kill-all-local-variables) (erase-buffer) (let ((all (overlay-lists))) === modified file 'lisp/emacs-lisp/eieio.el' --- lisp/emacs-lisp/eieio.el 2012-06-23 15:38:23 +0000 +++ lisp/emacs-lisp/eieio.el 2012-07-13 07:06:09 +0000 @@ -3040,7 +3040,7 @@ ;;; Start of automatically extracted autoloads. ;;;### (autoloads (customize-object) "eieio-custom" "eieio-custom.el" -;;;;;; "9cf80224540c52045d515a4c2c833543") +;;;;;; "928623502e8bf40454822355388542b5") ;;; Generated autoloads from eieio-custom.el (autoload 'customize-object "eieio-custom" "\ === modified file 'lisp/ffap.el' --- lisp/ffap.el 2012-05-10 06:27:12 +0000 +++ lisp/ffap.el 2012-07-13 07:06:09 +0000 @@ -1698,9 +1698,11 @@ (set-window-dedicated-p win wdp)) value)) -(defun ffap--toggle-read-only (buffer) - (with-current-buffer buffer - (with-no-warnings +(defun ffap--toggle-read-only (buffer-or-list) + (dolist (buffer (if (listp buffer-or-list) + buffer-or-list + (list buffer-or-list))) + (with-current-buffer buffer (toggle-read-only 1)))) (defun ffap-read-only () @@ -1710,8 +1712,7 @@ (let ((value (call-interactively 'ffap))) (unless (or (bufferp value) (bufferp (car-safe value))) (setq value (current-buffer))) - (mapc #'ffap--toggle-read-only - (if (listp value) value (list value))) + (ffap--toggle-read-only value) value)) (defun ffap-read-only-other-window () @@ -1719,8 +1720,7 @@ Only intended for interactive use." (interactive) (let ((value (ffap-other-window))) - (mapc #'ffap--toggle-read-only - (if (listp value) value (list value))) + (ffap--toggle-read-only value) value)) (defun ffap-read-only-other-frame () @@ -1728,8 +1728,7 @@ Only intended for interactive use." (interactive) (let ((value (ffap-other-frame))) - (mapc #'ffap--toggle-read-only - (if (listp value) value (list value))) + (ffap--toggle-read-only value) value)) (defun ffap-alternate-file () === modified file 'lisp/files.el' --- lisp/files.el 2012-07-06 19:06:54 +0000 +++ lisp/files.el 2012-07-13 07:06:09 +0000 @@ -4824,41 +4824,51 @@ "Modification-flag cleared")) (set-buffer-modified-p arg)) -(defun toggle-read-only (&optional arg) - "Change whether this buffer is read-only. +(defun toggle-read-only (&optional arg message) + "Toggle the read-only state of the current buffer. 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. - -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'." +positive; otherwise make it writable. + +When making the buffer read-only, enable View mode if +`view-read-only' is non-nil. When making the buffer writable, +disable View mode if View mode is enabled. + +If called interactively, or if called from Lisp with MESSAGE +non-nil, print a message reporting the buffer's new read-only +status. + +Do not call this from a Lisp program unless you really intend to +do the same thing as the \\[toggle-read-only] command, including +possibly enabling or disabling View mode. Also, note that this +command works by setting the variable `buffer-read-only', which +does not affect read-only regions caused by text properties. To +ignore read-only status in a Lisp program (whether due to text +properties or buffer state), bind `inhibit-read-only' temporarily +to a non-nil value." (interactive "P") - (if (and arg - (if (> (prefix-numeric-value arg) 0) buffer-read-only - (not buffer-read-only))) ; If buffer-read-only is set correctly, - nil ; do nothing. - ;; Toggle. - (progn - (cond - ((and buffer-read-only view-mode) - (View-exit-and-edit) - (make-local-variable 'view-read-only) - (setq view-read-only t)) ; Must leave view mode. - ((and (not buffer-read-only) view-read-only - ;; If view-mode is already active, `view-mode-enter' is a nop. - (not view-mode) - (not (eq (get major-mode 'mode-class) 'special))) - (view-mode-enter)) - (t (setq buffer-read-only (not buffer-read-only)) - (force-mode-line-update)))) - (if (called-interactively-p 'interactive) - (message "Read-only %s for this buffer" - (if buffer-read-only "enabled" "disabled"))))) + (cond + ;; Do nothing if `buffer-read-only' already matches the state + ;; specified by ARG. + ((and arg + (if (> (prefix-numeric-value arg) 0) + buffer-read-only + (not buffer-read-only)))) + ;; If View mode is enabled, exit it. + ((and buffer-read-only view-mode) + (View-exit-and-edit) + (set (make-local-variable 'view-read-only) t)) + ;; If `view-read-only' is non-nil, enable View mode. + ((and view-read-only + (not buffer-read-only) + (not view-mode) + (not (eq (get major-mode 'mode-class) 'special))) + (view-mode-enter)) + ;; The usual action: flip `buffer-read-only'. + (t (setq buffer-read-only (not buffer-read-only)) + (force-mode-line-update))) + (if (or message (called-interactively-p 'interactive)) + (message "Read-only %s for this buffer" + (if buffer-read-only "enabled" "disabled")))) (defun insert-file (filename) "Insert contents of file FILENAME into buffer after point. === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-07-09 22:12:19 +0000 +++ lisp/gnus/ChangeLog 2012-07-13 07:06:09 +0000 @@ -1,3 +1,8 @@ +2012-07-13 Chong Yidong + + * smime.el (smime-certificate-info): Set buffer-read-only directly, + instead of calling toggle-read-only with a (bogus) argument. + 2012-07-09 Tassilo Horn * gnus-sum.el (gnus-summary-limit-to-author): Use default value instead === modified file 'lisp/gnus/smime.el' --- lisp/gnus/smime.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/smime.el 2012-07-13 07:06:09 +0000 @@ -678,7 +678,7 @@ "x509" "-in" (expand-file-name certfile) "-text") (fundamental-mode) (set-buffer-modified-p nil) - (toggle-read-only t) + (setq buffer-read-only t) (goto-char (point-min)))) (defun smime-draw-buffer () === modified file 'lisp/help-mode.el' --- lisp/help-mode.el 2012-06-27 21:16:32 +0000 +++ lisp/help-mode.el 2012-07-13 07:06:09 +0000 @@ -30,7 +30,6 @@ ;;; Code: (require 'button) -(require 'view) (eval-when-compile (require 'easymenu)) (defvar help-mode-map @@ -288,10 +287,7 @@ ;;;###autoload (defun help-mode-finish () (when (eq major-mode 'help-mode) - ;; View mode's read-only status of existing *Help* buffer is lost - ;; by with-output-to-temp-buffer. - (toggle-read-only 1) - + (setq buffer-read-only t) (save-excursion (goto-char (point-min)) (let ((inhibit-read-only t)) === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2012-07-11 23:13:41 +0000 +++ lisp/ibuffer.el 2012-07-13 07:06:09 +0000 @@ -1283,7 +1283,7 @@ (:opstring "toggled read only status in" :interactive "P" :modifier-p t) - (toggle-read-only arg)) + (toggle-read-only arg t)) (define-ibuffer-op ibuffer-do-delete () "Kill marked buffers as with `kill-this-buffer'." === modified file 'lisp/vc/ediff.el' --- lisp/vc/ediff.el 2012-04-22 13:58:00 +0000 +++ lisp/vc/ediff.el 2012-07-13 07:06:09 +0000 @@ -152,7 +152,7 @@ ;; Used as a startup hook to set `_orig' patch file read-only. (defun ediff-set-read-only-in-buf-A () (ediff-with-current-buffer ediff-buffer-A - (toggle-read-only 1))) + (setq buffer-read-only t))) ;; Return a plausible default for ediff's first file: ;; In dired, return the file number FILENO (or 0) in the list ------------------------------------------------------------ revno: 109067 committer: Paul Eggert branch nick: trunk timestamp: Thu 2012-07-12 20:50:58 -0700 message: * xdisp.c (produce_special_glyphs): Now static. * dispextern.h (produce_special_glyphs): Remove decl. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-13 02:38:30 +0000 +++ src/ChangeLog 2012-07-13 03:50:58 +0000 @@ -1,3 +1,8 @@ +2012-07-13 Paul Eggert + + * xdisp.c (produce_special_glyphs): Now static. + * dispextern.h (produce_special_glyphs): Remove decl. + 2012-07-13 Glenn Morris * s/bsd-common, s/cygwin.h: Remove empty files. === modified file 'src/dispextern.h' --- src/dispextern.h 2012-07-08 16:38:43 +0000 +++ src/dispextern.h 2012-07-13 03:50:58 +0000 @@ -3065,7 +3065,6 @@ extern ptrdiff_t compute_display_string_end (ptrdiff_t, struct bidi_string_data *); extern void produce_stretch_glyph (struct it *); -extern void produce_special_glyphs (struct it *, enum display_element_type); #ifdef HAVE_WINDOW_SYSTEM === modified file 'src/xdisp.c' --- src/xdisp.c 2012-07-12 19:55:01 +0000 +++ src/xdisp.c 2012-07-13 03:50:58 +0000 @@ -951,6 +951,7 @@ #endif /* HAVE_WINDOW_SYSTEM */ +static void produce_special_glyphs (struct it *, enum display_element_type); static void show_mouse_face (Mouse_HLInfo *, enum draw_glyphs_face); static int coords_in_mouse_face_p (struct window *, int, int); @@ -24179,7 +24180,7 @@ non-null glyph_row member. This function ensures that fields like face_id, c, len of IT are left untouched. */ -void +static void produce_special_glyphs (struct it *it, enum display_element_type what) { struct it temp_it;