From: Glenn Morris Date: Thu, 28 Feb 2013 06:30:48 +0000 (-0800) Subject: Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org X-Git-Tag: emacs-24.3.90~173^2~6^2~28 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=929aeac608c271b2448dffec29aeea85c69d6bff;p=emacs.git Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org --- 929aeac608c271b2448dffec29aeea85c69d6bff diff --cc doc/emacs/ChangeLog index 44245441791,4531fed3d6a..bd70b1fdebf --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,8 -1,7 +1,12 @@@ -2013-02-27 Bastien Guerry ++2013-02-28 Bastien Guerry + + * xresources.texi (GTK resources): Fix broken link. + +2013-02-25 Eli Zaretskii + + * files.texi (Interlocking): Don't refer to symlinks as the + exclusive means of locking files. + 2013-02-22 Glenn Morris * ack.texi (Acknowledgments): diff --cc doc/lispref/ChangeLog index c4f45d02a05,af11ac181a6..42f5b5f5536 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,8 +1,8 @@@ -2013-02-27 Bastien Guerry ++2013-02-28 Bastien Guerry + + * variables.texi (File Local Variables): Fix reference. + -2013-02-23 Eli Zaretskii +2013-02-24 Eli Zaretskii * files.texi (Magic File Names): Improve wording and indexing. diff --cc doc/misc/ChangeLog index 632f06d22b1,f777696eff2..15b2b95026b --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,6 -1,19 +1,18 @@@ + 2013-02-28 Bastien Guerry + + * org.texi (Visibility cycling): Suggest to set + `org-agenda-inhibit-startup' to nil if user wants the startup + visibility settings to be honored in any circumstances. + (Progress logging, Checkboxes): Fix typos. + -2013-02-25 Michael Albinus ++2013-02-28 Michael Albinus + + * tramp.texi (top) [xxx, yyy, trampfn]: Provide two versions of + the macros, for Texinfo 4.13 and 5.0. + 2013-02-24 Michael Albinus - Port documentation to Texinfo 5.0. - + Port Tramp documentation to Texinfo 5.0. * tramp.texi (top) [xxx, yyy, trampfn]: Remove superfluous @c. (Filename Syntax): Do not use @trampfn{} in @item. (Filename completion): Use @columnfractions in @multitable. diff --cc lisp/ChangeLog index d12c7043303,da4cdb9bc62..5c19dd26489 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,103 -1,8 +1,107 @@@ -2013-02-25 Glenn Morris ++2013-02-28 Glenn Morris + + * textmodes/paragraphs.el (mark-paragraph): Doc fix. + -2013-02-21 Juri Linkov +2013-02-28 Stefan Monnier + + * doc-view.el: Preserve h&v scroll across C-c C-c C-c C-c. + (doc-view-fallback-mode): Remove overlays here. + (doc-view-toggle-display): Instead of here. Don't throw away + image-mode-winprops-alist. + (doc-view-goto-page): Don't mess with hscroll. + +2013-02-27 Thierry Volpiatto + + * font-lock.el (lisp-font-lock-keywords-2): Fix highlighting of + &optional (bug#13819). + +2013-02-27 Michael Albinus + + * net/tramp-adb.el (tramp-adb-parse-device-names) + (tramp-adb-maybe-open-connection): Add timeouts. (Bug#13299) + +2013-02-26 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-insert-directory): + Add "2>/dev/null" to the ls command, in case "en_US.utf8" is not + defined. POSIX environments fall back to the "C" locale then and + emit a warning, which shall be suppressed. + +2013-02-26 Stefan Monnier + + * emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Tweak logic. + (easy-mmode-set-keymap-parents): Use make-composed-keymap. + +2013-02-25 Stefan Monnier + + * emacs-lisp/bytecomp.el (byte-compile-file): Use let. + +2013-02-25 Juri Linkov + + * replace.el (read-regexp): Let-bind `default' to the first + element of `defaults' if it's a list, otherwise it should be + a string or nil. Let-bind `suggestions' to `defaults' if it's + a list, otherwise make a list with the string value. Doc fix. + (Bug#13805) + +2013-02-25 Eli Zaretskii + + * emacs-lisp/bytecomp.el (byte-recompile-directory): Reject files + that match "\`\.#", to avoid compiling lock files, even if they + are readable (as they are on MS-Windows). + +2013-02-25 Stefan Monnier + + * files.el (basic-save-buffer): Remove redundant directory-creation. + +2013-02-24 Jay Belanger + + * calc/calc-ext.el (math-to-radians-2, math-from-radians-2): + Add option to force `pi' to remain symbolic. + * calc/calcalg2.el (calcFunc-sin, calcFunc-cos, calcFunc-tan) + (calcFunc-cot, calcFunc-csc, calcFunc-sec, calcFunc-arcsin) + (calcFunc-arccos, calcFunc-arctan): Use symbolic `pi' in the + derivatives, when necessary. + +2013-02-23 Peter Kleiweg + + * progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i. + (ps-mode-octal-region): Use string-make-unibyte. + +2013-02-23 Glenn Morris + + * emulation/viper-cmd.el (viper-submit-report): + * progmodes/ps-mode.el (ps-mode-maintainer-address): + * progmodes/vera-mode.el (vera-mode-help-address): + * textmodes/artist.el (artist-maintainer-address): + * textmodes/reftex.el (reftex-report-bug): + * vc/ediff-util.el (ediff-submit-report): + Add bug-gnu-emacs to bug report address. + + * progmodes/simula.el (simula-mode-menu, simula-mode-map): + Remove bug report entries. + (simula-mode-help-address, simula-submit-bug-report): Make obsolete. + + * emacs-lisp/bytecomp.el (byte-compile-level): New. + (byte-compile-file, byte-compile-from-buffer): + Use separate input/output buffers for each level of recursive + byte-compile-file calls. (Bug#13787) + +2013-02-23 Michael Albinus + + * net/tramp.el (tramp-methods): Fix docstring. + (tramp-ssh-controlmaster-options): Rename it from + `tramp-ssh-controlmaster-template'. Return a string. + (tramp-default-method): Adapt check for + `tramp-ssh-controlmaster-options'. + + * net/tramp-sh.el (tramp-methods): + Replace `tramp-ssh-controlmaster-template' by "%c". + (tramp-do-copy-or-rename-file-out-of-band) + (tramp-maybe-open-connection): Use it in format spec. Ensure, + that it is applied for the first hop only. + +2013-02-22 Juri Linkov * isearch.el (isearch-lazy-highlight-new-loop): Set `isearch-lazy-highlight-start' and `isearch-lazy-highlight-end' diff --cc lisp/org/ChangeLog index 16d456ed51f,e6b1e564de3..5626b611f0d --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@@ -1,3 -1,77 +1,73 @@@ + 2013-02-28 Achim Gratz + + * org.el (org-org-menu): Use correct key "C-u C-c C-x !" to do + org-reload uncompiled in the menu. + + 2013-02-28 Bastien Guerry + - * org-indent.el - (org-indent-add-properties): Bugfix: prevent negative value for - `added-ind-per-lvl'. ++ * org-indent.el (org-indent-add-properties): Bugfix: prevent ++ negative value for `added-ind-per-lvl'. + + * org.el (org-mode): Add `org-fix-ellipsis-at-bol' to + `isearch-mode-end-hook' so that any isearch fixes the problem with + ellipsis on the first line. + (org-fix-ellipsis-at-bol): New defsubst. + (org-show-context, org-isearch-end): Use it. + - * org.el (org-show-context): Remove useless catch. Make sure the - top of the window is a visible headline. ++ * org.el (org-show-context): Remove useless catch. ++ Make sure the top of the window is a visible headline. + (org-activate-plain-links): Remove unused catch. + - * org-macs.el (org-get-alist-option): Return nil, not (nil), so - that `org-show-context' DTRT. ++ * org-macs.el (org-get-alist-option): Return nil, not (nil), ++ so that `org-show-context' DTRT. + + * org.el (org-imenu-get-tree): Fix bug when matching against empty + headlines. + + * org.el (org-overview): Stay on current line. + (org-map-entries): Fix docstring. + (org-at-clock-log-p): Delete. - + * org-clock.el (org-at-clock-log-p): Move here. + + * org.el (org-tsr-regexp-both): Don't activate dates in links. + (org-activate-dates): Change match boundaries according to the new + value of `org-tsr-regexp-both'. + + * org-agenda.el (org-agenda-to-appt): Fix typos. + + * org-agenda.el (org-agenda-local-vars): Don't include + `org-agenda-show-window' as it needs to be checked outside of the + agenda window. + + * org.el (org-set-tags-command): Fix bug when setting tags for + multiple headlines in an active region. + + * org-mobile.el (org-mobile-edit): DTRT when inserting a heading + in an invisible region. + - * org.el (org-insert-heading-respect-content): New `invisible-ok' - parameter. Add docstring. ++ * org.el (org-insert-heading-respect-content): Add docstring. ++ New `invisible-ok' parameter. + (org-insert-todo-heading-respect-content): Add docstring. + - * ob-tangle.el (org-babel-tangle-collect-blocks): Bugfix: remove - code references from blocks. ++ * ob-tangle.el (org-babel-tangle-collect-blocks): ++ Bugfix: remove code references from blocks. + + * org-agenda.el (org-agenda-schedule, org-agenda-deadline): + Cosmetic changes. + (org-agenda-show-new-time): Fix bug when displaying a temporary + overlay with the scheduled/deadline information. + - * org.el (org-fill-paragraph-with-timestamp-nobreak-p): New - function. ++ * org.el (org-fill-paragraph-with-timestamp-nobreak-p): New function. + (org-setup-filling): Use it to prevent breaking a timestamp when + filling a paragraph. + - * org-id.el (org-id-get-with-outline-path-completion): Fix - docstring. ++ * org-id.el (org-id-get-with-outline-path-completion): Fix docstring. + + 2013-02-28 Tim Burt (tiny change) + - * org-datetree.el (org-datetree-find-year-create): Match headlines - with tags. ++ * org-datetree.el (org-datetree-find-year-create): ++ Match headlines with tags. + 2013-02-07 Bastien Guerry * org-agenda.el (org-agenda-get-deadlines) diff --cc src/ChangeLog index 4135dadf28a,aa3d42d8042..1b8b3c56004 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,113 -1,8 +1,118 @@@ -2013-02-27 Eli Zaretskii ++2013-02-28 Eli Zaretskii + + * w32.c (sys_open): Don't reset the flags for FD in fd_info[]. + (Bug#13546). + +2013-02-27 Eli Zaretskii + + * filelock.c (create_lock_file) [WINDOWSNT]: Use _sopen with + _SH_DENYRW flag, instead of emacs_open, to deny any other process + access to the lock file until it is written and closed. + (Bug#13807) + +2013-02-27 Paul Eggert + + * callint.c (Qcall_interactively): + * macros.c (Qexecute_kbd_macro): + Now static. + +2013-02-26 Bastien Guerry + + * window.c (Frecenter): Tiny docstring enhancement. + +2013-02-26 Paul Eggert + + Minor textprop integer cleanup. + * intervals.h, textprop.c (add_text_properties_from_list): + Return void, not int, since nobody uses the return value. + * textprop.c (validate_plist, add_properties, remove_properties) + (Fadd_text_properties): + Don't assume list length fits in int. + (interval_has_all_properties, interval_has_some_properties) + (interval_has_some_properties_list, add_properties, remove_properties) + (Fadd_text_properties, Fremove_text_properties) + (Fremove_list_of_text_properties, text_property_stickiness): + Use bool for booleans. + (Fadd_text_properties, Fremove_text_properties): + (Fremove_list_of_text_properties): + Reindent do-while as per GNU style. + +2013-02-25 Eli Zaretskii + + Implement CLASH_DETECTION for MS-Windows. + + * filelock.c [WINDOWSNT]: Include w32.h. + (MAKE_LOCK_NAME): Don't use 'lock', it clashes with MS runtime + function of that name. Up-case the macro arguments. + (IS_LOCK_FILE): New macro. + (fill_in_lock_file_name): Use IS_LOCK_FILE instead of S_ISLNK. + (create_lock_file): New function, with body extracted from + lock_file_1. + [WINDOWSNT]: Implement lock files by writing a regular file with + the lock information as its contents. + (read_lock_data): New function, on Posix platforms just calls + emacs_readlinkat. + [WINDOWSNT]: Read the lock info from the file. + (current_lock_owner): Call read_lock_data instead of calling + emacs_readlinkat directly. + (lock_file) [WINDOWSNT]: Run the file name through + dostounix_filename. + + * w32proc.c (sys_kill): Support the case of SIG = 0, in which case + just check if the process by that PID exists. + + * w32.c (sys_open): Don't reset the _O_CREAT flag if _O_EXCL is + also present, as doing so will fail to error out if the file + already exists. + + * makefile.w32-in ($(BLD)/filelock.$(O)): Depend on src/w32.h. + + * textprop.c (Fadd_text_properties, Fremove_text_properties) + (Fremove_list_of_text_properties): Skip all of the intervals in + the region between START and END that already have resp. don't + have the requested properties, not just the first one. Add + assertions that the loop afterwards always modifies the + properties. (Bug#13743) + +2013-02-25 Stefan Monnier + + * callint.c (Fcall_interactively): Use the right lexical environment + for `interactive' specs (bug#13811). + * eval.c (Feval): Accept a lexical environment. + +2013-02-25 Paul Eggert + + Simplify data_start configuration (Bug#13783). + This is a followon simplification to the fix for Bug#13650. + * Makefile.in (LD_FIRSTFLAG, LIB_GCC, CRT_DIR, LIB_STANDARD) + (START_FILES): Remove. All uses removed. + (otherobj): Remove $(VMLIMIT_OBJ), as it's now first. + (ALLOBJS): Move here from autodeps.mk, and with VMLIMITS_OBJ first. + (buildobj.h): Use it. + ($(ALLOBJS)): Depend on globals.h. + (temacs$(EXEEXT)): Use $(ALLOBJS). + * autodeps.mk (ALLOBJS): Move to Makefile.in. + * deps.mk (vm-limit.o): + * makefile.w32-in ($(BLD)/vm-limit.$(O)): + Do not depend on mem-limits.h. + * emacs.c (__do_global_ctors, __do_global_ctors_aux) + (__do_global_dtors, __CTOR_LIST__, __DTOR_LIST__) + [__GNUC__ && !ORDINARY_LINK]: Remove. + * mem-limits.h, pre-crt0.c: Remove. + * unexaix.c, unexcoff.c: Don't include mem-limits.h. + * unexcoff.c (etext): New decl. + (make_hdr): Use DATA_START instead of start_of_data. + * vm-limit.c: Move most of mem-limits.h's contents here. + (data_start): New decl. It's OK if this is approximate, + so simplify-away some unnecessary exactness. + (POINTER): Remove; all uses removed. + (data_space_start): Now char *, to avoid casts. + (exceeds_lisp_ptr): New function, replacing the old + EXCEEDS_LISP_PTR macro. All uses changed. + (check_memory_limits): Simplify and remove casts. + (start_of_data) [!CANNOT_DUMP || !SYSTEM_MALLOC]: Remove. + (memory_warnings): Use data_start instead of start_of_data. + 2013-02-24 Andreas Schwab * xdisp.c (set_message): Only check for debug-on-message if STRING diff --cc src/w32.c index aff9771e4bb,56b840df797..f42b83af605 --- a/src/w32.c +++ b/src/w32.c @@@ -3402,17 -3120,12 +3402,15 @@@ in sys_open (const char * path, int oflag, int mode) { const char* mpath = map_w32_filename (path, NULL); - /* Try to open file without _O_CREAT, to be able to write to hidden - and system files. Force all file handles to be - non-inheritable. */ - int res = _open (mpath, (oflag & ~_O_CREAT) | _O_NOINHERIT, mode); + int res = -1; + + /* If possible, try to open file without _O_CREAT, to be able to + write to existing hidden and system files. Force all file + handles to be non-inheritable. */ + if ((oflag & (_O_CREAT | _O_EXCL)) != (_O_CREAT | _O_EXCL)) + res = _open (mpath, (oflag & ~_O_CREAT) | _O_NOINHERIT, mode); if (res < 0) res = _open (mpath, oflag | _O_NOINHERIT, mode); - if (res >= 0 && res < MAXDESC) - fd_info[res].flags = 0; return res; } diff --cc test/ChangeLog index f1281c8ed72,c8383a73300..fbd27021b5c --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,4 -1,24 +1,23 @@@ -2013-02-21 Fabián Ezequiel Gallina ++2013-02-28 Fabián Ezequiel Gallina + - * automated/python-tests.el - (python-tests-with-temp-buffer): Doc fix. ++ * automated/python-tests.el (python-tests-with-temp-buffer): Doc fix. + (python-tests-with-temp-file): New macro. + (python-tests-shell-interpreter): New var. + (python-shell-get-process-name-1) + (python-shell-internal-get-process-name-1) + (python-shell-parse-command-1) + (python-shell-calculate-process-environment-1) + (python-shell-calculate-process-environment-2) + (python-shell-calculate-process-environment-3) + (python-shell-calculate-exec-path-1) + (python-shell-calculate-exec-path-2) + (python-shell-make-comint-1) + (python-shell-make-comint-2) + (python-shell-get-process-1) + (python-shell-get-or-create-process-1) + (python-shell-internal-get-or-create-process-1): New tests. + -2013-02-20 Fabián Ezequiel Gallina +2013-02-21 Fabián Ezequiel Gallina * automated/python-tests.el: New file.