From: Glenn Morris Date: Sat, 14 Apr 2012 01:46:06 +0000 (-0700) Subject: Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org X-Git-Tag: emacs-24.2.90~471^2~364^2~3 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35dc09a19c606f9e7a078df32d030451c7c90ba1;p=emacs.git Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org --- 35dc09a19c606f9e7a078df32d030451c7c90ba1 diff --cc doc/emacs/ChangeLog index 43ae54b2c02,b8c96d83fa5..156f59471f6 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,10 -1,52 +1,54 @@@ -2012-04-13 Glenn Morris ++2012-04-14 Glenn Morris + + * mule.texi (Select Input Method, Coding Systems, Recognize Coding): + Copyedits. + (Coding Systems): Mac OS X apparently uses newlines for EOL. + (Recognize Coding): Remove old auto-coding-regexp-alist example. + auto-coding-functions does not override coding: tags. + Remove rmail-decode-mime-charset; it no longer has any effect. + -2012-04-12 Chong Yidong ++2012-04-14 Chong Yidong + + * custom.texi (Creating Custom Themes): Add reference to Custom + Themes node in Lisp manual. + -2012-04-12 Glenn Morris ++2012-04-14 Glenn Morris + + * mule.texi (International): Copyedits. + (International Chars): Update C-x = example output. + (Disabling Multibyte): Rename from "Enabling Multibyte". + Clarify what "unibyte: t" does, and mode-line description. + (Unibyte Mode): Update for "Disabling Multibyte" node name change. + Use Texinfo recommended convention for quotes+punctuation. + (Language Environments): Copyedits. + (Input Methods): Copyedits. Use "^" for the postfix example, + because it is less confusing inside Info's `quotes'. + + * custom.texi (Specifying File Variables): Fix "unibyte" description. + Update for "Disabling Multibyte" node name change. + * emacs.texi: Update for "Disabling Multibyte" node name change. + -2012-04-10 Glenn Morris - + * abbrevs.texi, arevert-xtra.texi, buffers.texi, building.texi: + * cmdargs.texi, custom.texi, entering.texi, files.texi, frames.texi: + * glossary.texi, help.texi, macos.texi, maintaining.texi, mini.texi: + * misc.texi, package.texi, programs.texi, screen.texi, search.texi: + * sending.texi, text.texi, trouble.texi: + Use @file for buffers, per the Texinfo manual. + + * entering.texi (Entering Emacs): + Do not mention initial-buffer-choice = t. + -2012-04-08 Glenn Morris - + * misc.texi (Gnus Startup): Use @env for environment variables. + ++ * Makefile.in: Replace non-portable use of $< in ordinary rules. ++ +2012-04-12 Glenn Morris + + * ack.texi (Acknowledgments): Don't mention obsolete mailpost.el. + 2012-04-07 Glenn Morris - * Makefile.in: Replace non-portable use of $< in ordinary rules. + * emacsver.texi (EMACSVER): Bump version to 24.1.50. 2012-04-05 Glenn Morris diff --cc doc/lispintro/ChangeLog index adac111f5f9,aae78b4aff1..d9ebf07952c --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@@ -1,3 -1,7 +1,7 @@@ -2012-04-07 Glenn Morris ++2012-04-14 Glenn Morris + + * Makefile.in: Replace non-portable use of $< in ordinary rules. + 2012-02-28 Glenn Morris * emacs-lisp-intro.texi: Standardize possessive apostrophe usage. diff --cc doc/lispref/ChangeLog index b5bdba1296f,e58ef2aa3ec..6b3aba6d799 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,16 -1,48 +1,53 @@@ -2012-04-13 Chong Yidong - - * customize.texi (Custom Themes): Also document load-theme etc. - -2012-04-12 Chong Yidong ++2012-04-14 Chong Yidong + + * customize.texi (Applying Customizations): + (Custom Themes): New nodes. + + * display.texi (Defining Faces): Reference custom-set-faces. + + * modes.texi (Defining Minor Modes, Defining Minor Modes): + * os.texi (Startup Summary): Copyedits. + -2012-04-12 Glenn Morris ++2012-04-14 Glenn Morris + + * loading.texi (Loading Non-ASCII): "unibyte:" can also be at the end. + -2012-04-10 Glenn Morris - + * strings.texi (Case Tables): + * objects.texi (General Escape Syntax): + * keymaps.texi (Key Sequences): Use @acronym with "ASCII". + + * buffers.texi, compile.texi, customize.texi, debugging.texi: + * display.texi, edebug.texi, eval.texi, help.texi, intro.texi: + * keymaps.texi, minibuf.texi, modes.texi, os.texi, processes.texi: + * text.texi: Use @file for buffers, per the Texinfo manual. + + * compile.texi (Compiler Errors): Add missing space in buffer name. + -2012-04-08 Chong Yidong ++2012-04-14 Chong Yidong + + * processes.texi (Query Before Exit): Remove obsolete function + process-kill-without-query (Bug#11190). + -2012-04-08 Glenn Morris ++2012-04-14 Glenn Morris + + * files.texi, frames.texi, loading.texi, os.texi, processes.texi: + Use @env for environment variables. + -2012-04-07 Glenn Morris - + * Makefile.in: Replace non-portable use of $< in ordinary rules. + +2012-04-12 Jari Aalto + + * processes.texi (Synchronous Processes): Mention + `default-directory' (bug#7515). + +2012-04-09 Chong Yidong + + * customize.texi (Variable Definitions): Remove user-variable-p. + + * commands.texi (Interactive Codes): + * help.texi (Accessing Documentation): + * minibuf.texi (High-Level Completion): Callers changed. + 2012-04-06 Chong Yidong * minibuf.texi (Programmed Completion): Document metadata method. diff --cc doc/misc/ChangeLog index be79a9d864d,8f920f62718..46fea77107b --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,15 -1,38 +1,36 @@@ -2012-04-13 Glenn Morris - - * Makefile.in: Replace non-portable use of $< in emacs-gnutls rules. - -2012-04-12 Eli Zaretskii - - * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add emacs-gnutls. - ($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets. - -2012-04-12 Teodor Zlatanov - - * emacs-gnutls.texi: Add documentation for the GnuTLS integration. - * Makefile.in: Add emacs-gnutls.texi to build. - -2012-04-11 Alan Mackenzie ++2012-04-14 Alan Mackenzie + + * cc-mode.texi (c-offsets-alist): Correct a typo. + -2012-04-11 Jérémie Courrèges-Anglas (tiny change) ++2012-04-14 Jérémie Courrèges-Anglas (tiny change) + + * org.texi (Deadlines and scheduling): Fix the example: the + DEADLINE item should come right after the headline. We enforce + this convention, so it is a bug not to illustrate it correctly in + the manual. + -2012-04-11 Ippei FURUHASHI (tiny change) ++2012-04-14 Ippei FURUHASHI (tiny change) + + * org.texi (Agenda commands): Fix documentation bug by swapping + the equivalent keybindings to `org-agenda-next-line' with the ones + to `org-agenda-previous-line'. + -2012-04-07 Glenn Morris ++2012-04-14 Glenn Morris + + * Makefile.in: Replace non-portable use of $< in ordinary rules. + +2012-04-09 Eli Zaretskii + + * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add + emacs-gnutls. + ($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets. + +2012-04-09 Teodor Zlatanov + + * Makefile.in: Add emacs-gnutls.texi to build. + + * emacs-gnutls.texi: Add documentation for the GnuTLS integration. + 2012-04-05 Teodor Zlatanov * auth.texi (Secret Service API): Edit further and give examples. diff --cc lib-src/ChangeLog index aad382de6d0,dd10026447f..9ebe8a177ab --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@@ -1,20 -1,8 +1,25 @@@ -2012-04-12 Juanma Barranquero ++2012-04-14 Juanma Barranquero + + * emacsclient.c (decode_options) [WINDOWSNT]: + Call ttyname instead of passing its address (typo in 2011-12-04T17:13:01Z!lekktu@gmail.com). + +2012-04-07 Eli Zaretskii + + * makefile.w32-in (obj): Add xml.o. + +2012-04-07 Eli Zaretskii + + * makefile.w32-in (ALL): Now the list of executables, not of phony + targets. + (.PHONY): Only make-docfile is its prerequisite now. + (make-docfile): Don't depend on stamp_BLD. Add a comment about + the need in this target. + (ctags, etags, ebrowse, hexl, movemail, emacsclient) + (test-distrib): Phony targets removed. + ($(BLD)/test-distrib.exe): Run test-distrib as part of the recipe. + (all): Don't depend on stamp_BLD. + (ALL): Include $(BLD)/test-distrib.exe. + 2012-03-11 Andreas Schwab * emacsclient.c (main): Handle -print-nonl command. diff --cc lisp/ChangeLog index f6213bbd186,4b031a5dfe9..7ca8751216f --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,276 -1,81 +1,345 @@@ -2012-04-13 Kim F. Storm ++2012-04-14 Kim F. Storm + + * emulation/cua-base.el (cua-exchange-point-and-mark): Just call + exchange-point-and-mark if cua-enable-cua-keys is nil (Bug#11191). + -2012-04-12 Chong Yidong ++2012-04-14 Chong Yidong + + * custom.el (custom-theme-set-variables): Doc fix. + -2012-04-12 Glenn Morris ++2012-04-14 Glenn Morris + + * international/mule.el (set-auto-coding-for-load): Doc fix. + -2012-04-11 Stefan Monnier - - * imenu.el (imenu-add-to-menubar): `current-local-map' can be nil. - Reported by Noah Friedman. Backport from trunk. - -2012-04-11 Alan Mackenzie ++2012-04-14 Alan Mackenzie + - * progmodes/cc-menus.el (cc-imenu-objc-generic-expression): - Make imenu work again for Objective C Mode. Correct the *-index - values, these having been disturbed by a previous change in 2011-08. ++ * progmodes/cc-menus.el (cc-imenu-objc-generic-expression): Make ++ imenu work again for Objective C Mode. Correct the *-index values, ++ these having been disturbed by a previous change in 2011-08. + + * progmodes/cc-engine.el (c-before-change-check-<>-operators): + Correct two search limits. + -2012-04-10 Stefan Monnier ++2012-04-14 Stefan Monnier + + * startup.el (command-line-1): Inhibit splash from daemon (bug#10996). + -2012-04-10 Andreas Schwab ++2012-04-14 Andreas Schwab + + * international/characters.el: Fix sorting. + -2012-04-10 Eli Zaretskii ++2012-04-14 Eli Zaretskii + + * international/characters.el: Add more missing Latin case pairs. + -2012-04-10 Andreas Schwab - - * international/characters.el: Recover lost case pairs. - -2012-04-10 Glenn Morris ++2012-04-14 Glenn Morris + + * files.el (dir-locals-set-class-variables): Doc fix. + -2012-04-09 Eli Zaretskii ++2012-04-14 Eli Zaretskii + + * international/characters.el: Add set-case-syntax-pair call for + LATIN CAPITAL LETTER Y WITH DIAERESIS RET and its lower-case + counterpart. (Bug#11209) + + * simple.el (shell-command-on-region): Doc fix. (Bug#11208) + -2012-04-09 Glenn Morris ++2012-04-14 Glenn Morris + + * calendar/holidays.el (calendar-check-holidays): Doc fix. + -2012-04-08 Eli Zaretskii ++2012-04-14 Eli Zaretskii + - * textmodes/ispell.el (ispell-dictionary-base-alist): Add data for - Hebrew. ++ * textmodes/ispell.el (ispell-dictionary-base-alist): ++ Add data for Hebrew. + -2012-04-08 Chong Yidong ++2012-04-14 Chong Yidong + - * net/rcirc.el (rcirc-cmd-quit): Revert 2012-03-18 change - (Bug#11192). ++ * net/rcirc.el (rcirc-cmd-quit): ++ Revert 2012-03-18 change (Bug#11192). + -2012-04-07 Glenn Morris ++2012-04-14 Glenn Morris + + * pcmpl-rpm.el (pcomplete/rpm): Handle -qf. + -2012-04-07 Eli Zaretskii ++2012-04-14 Eli Zaretskii + + * minibuffer.el (completion-in-region-mode-map): + Bind completion-help-at-point to M-? rather than ?. (Bug#11182) + +2012-04-13 Vivek Dasmohapatra + + * hexl.el (hexl-insert-char): Make display sizes other than 16 work. + +2012-04-13 Masatake YAMATO + + * minibuffer.el (minibuffer-local-filename-syntax): New variable + to allow `C-M-f' and `C-M-b' to move to the nearest path + separator (bug#9511). + +2012-04-13 Lars Ingebrigtsen + + * avoid.el: Require cl when compiling. And also move the + `provide' to the end. + +2012-04-13 Thierry Volpiatto + + * avoid.el (mouse-avoidance-banish-position): New variable. + (mouse-avoidance-banish-destination): Use it (bug#10165). + +2012-04-13 Leo Liu + + * progmodes/which-func.el (which-func-modes): Add objc-mode. + +2012-04-13 Ken Brown + + * net/browse-url.el (browse-url-file-url): Remove Cygwin hack; + this is no longer needed now that cygstart understands file:// + URLs. + (browse-url-filename-alist): For the same reason, don't modify + file:// URLs on Cygwin. + +2012-04-13 Stefan Monnier + + * emulation/cua-base.el (cua--pre-command-handler-1): Don't activate + the region on shift if the binding is already shifted (bug#11221). + +2012-04-12 Glenn Morris + + * mail/mailpost.el: Move to obsolete/. + +2012-04-12 Drew Adams + + * imenu.el (imenu--generic-function): Ignore invisible definitions + (bug#10123). + +2012-04-12 Vivek Dasmohapatra + + * hexl.el (hexl-bits): New variable. + (hexl-options): Mention the variable in the doc string. + (hexl-rulerise): New function. + (hexl-line-displen): New function + (hexl-mode): Mention the new variable. + (hexl-mode, hexl-current-address, hexl-current-address): Use the + displen. + (hexl-ascii-start-column): New function. + (hexl-address-to-marker, hexl-beginning-of-line, hexl-options) + (hexl-insert-char, hexl-mode-ruler): Use the displen (bug#4941). + +2012-04-12 Agustín Martín Domingo + + * textmodes/flyspell.el (flyspell-large-region): For hunspell, use + '("-i" ENCODING), in 2 separate command-line arguments, to specify + the encoding, as expected by hunspell. + +2012-04-12 Stefan Monnier + + * battery.el (battery--linux-sysfs-regexp): New const. + (battery-status-function): Use it. Remove yeeloong special case. + (battery-yeeloong-sysfs): Remove. + (battery-echo-area-format): Remove yeeloong special case. + +2012-04-11 Stefan Monnier + + * imenu.el (imenu-add-to-menubar): `current-local-map' can be nil. + Reported by Noah Friedman. + + * subr.el (read-passwd): Use read-string. + +2012-04-11 Lars Magne Ingebrigtsen + + * vcursor.el (vcursor-move): Increase the priority of the overlay + (bug#9663). + +2012-04-11 Deniz Dogan + + * net/rcirc.el (rcirc-kill-channel-buffers): New variable. + (rcirc-kill-buffer-hook): Use it to kill channel buffers (bug#5128). + +2012-04-11 William Stevenson + + * textmodes/artist.el (artist-mode): Convert artist-mode to use + define-minor-mode (bug#10760). + +2012-04-11 Wolfgang Jenkner (tiny change) + + * lisp/progmodes/grep.el (rgrep): Tweak the find command line so + that directories matching `grep-find-ignored-files' won't be + pruned (bug#10351). + +2012-04-11 Chong Yidong + + * startup.el (command-line): Remove support for long-obsolete + variable font-lock-face-attributes. + +2012-04-11 Glenn Morris + + * vc/vc-bzr.el (vc-bzr-status): Avoid condition-case-unless-debug. + +2012-04-11 Stefan Monnier + + * window.el (window--state-get-1): Obey window-point-insertion-type. + +2012-04-11 Lennart Borgman + + * emacs-lisp/lisp.el (narrow-to-defun): `beginning-of-defun' goes + to previous function when point is on the first character of a + function. Take care of that in `narrow-to-defun' (bug#6157). + +2012-04-11 Glenn Morris + + * vc/vc-bzr.el (vc-bzr-status): Handle all errors, + not just file-errors. + + * vc/vc-bzr.el (vc-bzr-sha1-program, sha1-program): Remove. + (vc-bzr-sha1): Use internal sha1. + +2012-04-11 Stefan Monnier + + * progmodes/flymake.el (flymake-mode): Beware read-only dirs (bug#8954). + +2012-04-10 Sébastien Gross (tiny change) + + * progmodes/hideshow.el (hs-hide-all): Don't infloop on comments + that start in the middle of the line (bug#10496). + +2012-04-10 Dan Nicolaescu + + * battery.el (battery-linux-proc-acpi): Only one battery is + discharged at a time, but that seems to confuse battery.el when + computing `rate-type' for the battery not being discharged + (bug#10332). + +2012-04-10 Stefan Monnier + + * emacs-lisp/autoload.el (autoload-make-program): Remove, unused. + + * international/quail.el: Use dolist and simplify. + (quail-define-package, quail-update-keyboard-layout) + (quail-define-rules): Use dolist. + (quail-insert-kbd-layout, quail-get-translation): CSE. + + * tmm.el: Use dolist, remove left over hook. + (tmm-prompt, tmm-define-keys, tmm-shortcut, tmm-get-keybind): + Use dolist. + (calendar-load-hook): Don't mess with it. + + * vc/vc-annotate.el (vc-annotate-show-diff-revision-at-line-internal): + Use derived-mode-p. Run the diff asynchronously. + +2012-04-10 Lars Magne Ingebrigtsen + + * obsolete/mouse-sel.el: Add an Obsolete-since header. + +2012-04-10 Juanma Barranquero + + * misc.el: Display absolute path of loaded DLLs (bug#10424). + (list-dynamic-libraries--loaded): New function. + (list-dynamic-libraries--refresh): Use it. + +2012-04-10 Nathan Weizenbaum + + * progmodes/python.el (python-fill-paragraph): + Make python-fill-region in a multiline string work when font-lock is + disabled (bug#7018). + +2012-04-10 Laimonas Vėbra (tiny change) + + * language/european.el (cp775): Add oem/legacy (en)coding on + DOS/MS Windows for the Baltic languages. There are still plenty of + texts written in this encoding/codepage (bug#6519). + +2012-04-10 Glenn Morris + + * cus-start.el (eol-mnemonic-unix, eol-mnemonic-dos, eol-mnemonic-mac): + Add :standard values, reducing "rogue" customs in emacs -Q a bit more. + +2012-04-10 Florian Adamsky (tiny change) + + * recentf.el (recentf-dialog-mode-map): Add two keybindings for + next-line "n" and previous-line "p" in order to make recentf more + consistent with ibuffer, dired or org-mode (bug#9387). + +2012-04-10 Lars Magne Ingebrigtsen + + * image.el (put-image): Return the overlay created instead of the + optional input string (bug#7834). Note that this may break code + that is (for some reason or other) depending on `put-image' + returning the string. + + * mouse-sel.el (mouse-sel-mode): Mark as obsolete (bug#6174). + + * simple.el (zap-to-char): Allow zapping using input methods + (bug#1580). + + * textmodes/fill.el (fill-region): Leave point and mark where they + were before filling (bug#5399). + +2012-04-09 Glenn Morris + + * version.el (emacs-bzr-get-version): + Handle lightweight checkouts of local branches. + +2012-04-09 Andreas Schwab + + * international/characters.el: Recover lost case pairs. (Bug#11209) + +2012-04-09 Chong Yidong + + * custom.el (custom-variable-p): Return nil for non-symbol + arguments instead of signaling an error. + (user-variable-p): Obsolete alias for custom-variable-p. + + * apropos.el (apropos-variable): + * files-x.el (read-file-local-variable): + * simple.el (set-variable): + * woman.el (woman-mini-help): + * emacs-lisp/byte-opt.el (side-effect-free-fns): Callers changed. + +2012-04-09 Glenn Morris + + * startup.el (normal-top-level): Don't look for leim-list.el + in places where it will not be found. (Bug#910) + + * international/mule-cmds.el (set-default-coding-systems): + * files.el (normal-mode): + Remove guarded calls to ucs-set-table-for-input. (Bug#9821) + This function was removed with ucs-tables.el in 2008. + +2012-04-08 Eli Zaretskii + + * textmodes/ispell.el (ispell-check-version): For hunspell, set + ispell-encoding8-command to "-i", without a trailing space. + (ispell-start-process): For hunspell, use '("-i" ENCODING), in 2 + separate command-line arguments, to specify the encoding, since + that's how hunspell expects it. + +2012-04-08 Glenn Morris + + * loadup.el: Load bindings before cus-start. + This reduces somewhat the number of "rogue" settings in emacs -Q. + +2012-04-07 Glenn Morris + + * version.el (emacs-bzr-get-version): New function. + (emacs-bzr-version): New variable. + * loadup.el (emacs-bzr-version): Set it. (Bug#8054) + * mail/emacsbug.el (report-emacs-bug): Include bzr version. + +2012-04-07 Eli Zaretskii + + * international/uni-bidi.el, international/uni-category.el: + * international/uni-combining.el, international/uni-decimal.el: + * international/uni-decomposition.el, international/uni-digit.el: + * international/uni-lowercase.el, international/uni-mirrored.el: + * international/uni-name.el, international/uni-numeric.el: + * international/uni-titlecase.el, international/uni-uppercase.el: + Update for Unicode 6.1. + +2012-04-07 Eli Zaretskii + + * term/w32-win.el (dynamic-library-alist): Add libxml2 DLLs. + 2012-04-05 Lars Magne Ingebrigtsen * window.el (shrink-window): Mention the `window-min-height' diff --cc lisp/gnus/ChangeLog index ef0f1c5c852,b1f298bdb16..23e800e0f3f --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@@ -1,3 -1,21 +1,19 @@@ -2012-04-12 Lars Magne Ingebrigtsen ++2012-04-14 Lars Magne Ingebrigtsen + + * gnus-msg.el (gnus-inews-insert-gcc): Don't do the alist stuff when we + don't have a current group. + -2012-04-10 Lars Magne Ingebrigtsen - + * gnus-msg.el (gnus-inews-insert-gcc): Protect against when we don't + have a group name. + + * gnus-art.el (article-wash-html): Ensure that we insert the HTML into + a multibyte buffer (bug#7410). + (article-wash-html): Parse the original article buffer to get the + unencoded data (bug#7410). + + * gnus-start.el (gnus-read-newsrc-el-file): Protect against broken + .newsrc.el files. + 2012-03-22 Lars Magne Ingebrigtsen * auth-source.el (auth-source-netrc-create): Quote tokens that contain diff --cc lisp/org/ChangeLog index 618d5753a46,0e80ea2fa2e..86f493a0a5b --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@@ -1,3 -1,50 +1,49 @@@ -2012-04-11 Bastien Guerry ++2012-04-14 Bastien Guerry + + * org.el (org-point-at-end-of-empty-headline): Only try to match - ̀org-todo-line-regexp' when the value is non-nil, e.g. in non-org ++ `org-todo-line-regexp' when the value is non-nil, e.g. in non-org + modes. + (org-fontify-meta-lines-and-blocks-1): Prevent errors when trying + to fontify beyond (point-max). + + * org-clock.el (org-clock-task-overrun-text) + (org-task-overrun, org-clock-get-clock-string) + (org-clock-update-mode-line) + (org-clock-notify-once-if-expired): Rename `org-task-overrun' + and `org-task-overrun-text' to `org-clock-task-overrun' and + `org-clock-task-overrun-text' respectively. + (org-task-overrun-text): New alias. + + * org-table.el (org-table-eval-formula): Fix bug about handling + remote references as durations. + (org-table-get-range): Fix bug: make sure references to $0 are + correctly handled. + - * org-pcomplete.el (pcomplete/org-mode/file-option): Fix bug in - `pcomplete/org-mode/file-option'. ++ * org-pcomplete.el (pcomplete/org-mode/file-option): ++ Fix bug in `pcomplete/org-mode/file-option'. + (org-thing-at-point): Also match line options like LATEX_CLASS + when pcompleting from LATEX_. + + * org-agenda.el (org-agenda-filter-make-matcher) + (org-agenda-filter-apply): Allow filtering entries out by + category. Using `C-u <' from the agenda view will redisplay - the agenda without entries from categories of the current - line. ++ the agenda without entries from categories of the current line. + -2012-04-11 Eric Schulte ++2012-04-14 Eric Schulte + - * ob-C.el (org-babel-C-ensure-main-wrap): Add an explicit return - to automatically generated main methods. ++ * ob-C.el (org-babel-C-ensure-main-wrap): ++ Add an explicit return to automatically generated main methods. + -2012-04-11 Matt Lundin ++2012-04-14 Matt Lundin + - * org.el (org-after-todo-state-change-hook): Fix docstring to - reflect name change of state to `org-state'. ++ * org.el (org-after-todo-state-change-hook): ++ Fix docstring to reflect name change of state to `org-state'. + -2012-04-11 Mike Sperber (tiny change) ++2012-04-14 Mike Sperber (tiny change) + - * org-footnote.el (org-footnote-normalize): Correctly pass keyword - arguments to `org-export-preprocess-string'. ++ * org-footnote.el (org-footnote-normalize): ++ Correctly pass keyword arguments to `org-export-preprocess-string'. + 2012-04-03 Bastien Guerry * org.el (org-todo): Fix regression: rename `state' to diff --cc nt/ChangeLog index c7b94e64083,23e93907552..323e00bbd5f --- a/nt/ChangeLog +++ b/nt/ChangeLog @@@ -1,29 -1,7 +1,33 @@@ -2012-04-11 Dani Moncayo (tiny change) ++2012-04-14 Dani Moncayo (tiny change) + + * makefile.w32-in: Fix typo (Bug#10261). + +2012-04-10 Eli Zaretskii + + * makefile.w32-in (emacs, misc, lispref, lispintro): New targets, + each runs makeinfo in its own subdirectory of 'doc'. + (info-gmake): Depend on these new targets. + +2012-04-07 Glenn Morris + + * config.nt, makefile.w32-in, emacs.rc, emacsclient.rc: + Bump version to 24.1.50. + +2012-04-07 Eli Zaretskii + + * configure.bat: Support building with libxml2. + + * INSTALL: + * README.W32: Add information about libxml2. + +2012-04-07 Eli Zaretskii + + * makefile.w32-in: Convert to Unix EOL format. + (all): Don't depend on stamp_BLD and on maybe-bootstrap. + (all-other-dirs-$(MAKETYPE)): Depend on maybe-bootstrap. + (bootstrap-gmake): Invoke the "clean" and build targets in 2 + separate commands, so they run in that order even under "make -j". + 2012-03-29 Eli Zaretskii * config.nt: Discourage from defining HAVE_GETCWD. diff --cc nt/makefile.w32-in index fcf57e8046d,5bd7fec0cc0..3ddf3a04cb6 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@@ -1,469 -1,465 +1,469 @@@ -# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. -# Copyright (C) 2000-2012 Free Software Foundation, Inc. -# -# Top level makefile for building GNU Emacs on Windows NT -# -# This file is part of GNU Emacs. - -# GNU Emacs is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# GNU Emacs is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with GNU Emacs. If not, see . - - -# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out -# (and remove or replace this comment). - -VERSION = 24.0.95 - -TMP_DIST_DIR = emacs-$(VERSION) - -TRES = $(BLD)/emacs.res -CLIENTRES = $(BLD)/emacsclient.res - -XMFLAGS = - -ALL = addpm ddeclient runemacs cmdproxy addsection preprep - -.PHONY: $(ALL) - - -addpm: stamp_BLD $(BLD)/addpm.exe -$(BLD)/addpm.exe: $(BLD)/addpm.$(O) - $(LINK) $(LINK_OUT)$@ \ - $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \ - $(USER32) $(OLE32) $(UUID) $(SHELL32) - -ddeclient: stamp_BLD $(BLD)/ddeclient.exe -$(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O) - $(LINK) $(LINK_OUT)$@ \ - $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) - -cmdproxy: stamp_BLD $(BLD)/cmdproxy.exe -$(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O) - $(LINK) $(LINK_OUT)$@ \ - $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) - -addsection: stamp_BLD $(BLD)/addsection.exe -$(BLD)/addsection.exe: $(BLD)/addsection.$(O) - $(LINK) $(LINK_OUT)$@ \ - $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) - -preprep: stamp_BLD $(BLD)/preprep.exe -$(BLD)/preprep.exe: $(BLD)/preprep.$(O) - $(LINK) $(LINK_OUT)$@ \ - $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) - -# -# The resource file. NT 3.10 requires the use of cvtres; even though -# it is not necessary on later versions, it is still ok to use it. -# -$(TRES): emacs.rc icons/emacs.ico emacs.manifest stamp_BLD - $(RC) $(RC_OUT)$(TRES) emacs.rc - -$(CLIENTRES): emacsclient.rc stamp_BLD - $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc - -runemacs: stamp_BLD $(BLD)/runemacs.exe -$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) - $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \ - $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) - -which-sh: - @echo Using $(THE_SHELL) as shell. - -# These depend on stamp_BLD to make sure the $(BLD) directory is created -# before the compilation begins, even if Make runs several commands -# in parallel under "make -j". -# -$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): stamp_BLD - -# -# Build emacs -# -all: which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE) - -all-other-dirs-nmake: addsection - cd ..\lib - $(MAKE) $(MFLAGS) all - cd ..\lib-src - $(MAKE) $(MFLAGS) all - cd ..\src - $(MAKE) $(MFLAGS) all - cd ..\lisp - $(MAKE) $(MFLAGS) all - cd ..\leim - $(MAKE) $(MFLAGS) all - cd ..\nt - -all-other-dirs-gmake: addsection - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim all - -recompile: recompile-$(MAKETYPE) - -recompile-nmake: - cd ..\lisp - $(MAKE) $(MFLAGS) recompile - cd ..\nt - -recompile-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp recompile - -#### Bootstrapping. - -### This is meant for Emacs maintainers only. It first cleans the -### lisp subdirectory, removing all compiled Lisp files. Then a -### special emacs executable is built from Lisp sources, which is then -### used to compile Lisp files. The last step is a "normal" make. - -maybe-bootstrap: maybe-bootstrap-$(SHELLTYPE) - -# dummy target to force other targets to be evaluated. -doit: - -maybe-bootstrap-CMD: doit - @echo . - @if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing. You should either - @if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow - @echo . - @if not EXIST ..\lisp\abbrev.elc exit -1 - -maybe-bootstrap-SH: doit - @if [ ! -f ../lisp/abbrev.elc ] ; then \ - echo; \ - echo "Essential Lisp files seem to be missing. You should either"; \ - echo "do \`make bootstrap' or create \`lisp/abbrev.elc' somehow."; \ - echo; \ - exit -1; \ - fi - -# Bootstrap depends on cmdproxy because some Lisp functions -# loaded during bootstrap may need to run shell commands. -bootstrap: addsection cmdproxy bootstrap-$(MAKETYPE) - $(MAKE) $(MFLAGS) $(XMFLAGS) all - -bootstrap-nmake: addsection cmdproxy - cd ..\lisp - $(MAKE) $(MFLAGS) bootstrap-clean - cd ..\src - $(MAKE) $(MFLAGS) clean - cd ..\lib-src - $(MAKE) $(MFLAGS) clean make-docfile - cd ..\lib - $(MAKE) $(MFLAGS) clean all - cd ..\src - $(MAKE) $(MFLAGS) bootstrap - $(MAKE) $(MFLAGS) bootstrap-clean - cd ..\nt - $(CP) $(BLD)/cmdproxy.exe ../bin - cd ..\lisp - $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap - cd ..\lib-src - $(MAKE) $(MFLAGS) DOC - cd ..\nt - -bootstrap-gmake: addsection cmdproxy - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean make-docfile - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean all - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean - $(CP) $(BLD)/cmdproxy.exe ../bin - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC - -bootstrap-clean: bootstrap-clean-$(MAKETYPE) - -bootstrap-clean-nmake: - cd ..\src - $(MAKE) $(MFLAGS) bootstrap-clean - cd ..\lib - $(MAKE) $(MFLAGS) clean - cd ..\lisp - $(MAKE) $(MFLAGS) bootstrap-clean - -bootstrap-clean-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean - -$(INSTALL_DIR): - - mkdir "$(INSTALL_DIR)" - -$(INSTALL_DIR)/bin: $(INSTALL_DIR) - - mkdir "$(INSTALL_DIR)/bin" - -# -# Build and install emacs in INSTALL_DIR -# -.PHONY: install-bin install-shortcuts - -install: install-bin install-shortcuts - -install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE) - - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin - - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin - - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin - - $(CP) README.W32 $(INSTALL_DIR) - - $(DEL) ../$(DIRNAME)_same-dir.tst - - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst - echo SameDirTest > "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst" - - mkdir "$(INSTALL_DIR)/etc" - - mkdir "$(INSTALL_DIR)/info" - - mkdir "$(INSTALL_DIR)/lock" - - mkdir "$(INSTALL_DIR)/data" - - mkdir "$(INSTALL_DIR)/site-lisp" - - mkdir "$(INSTALL_DIR)/etc/icons" - $(IFNOTSAMEDIR) $(CP) ../site-lisp/subdirs.el $(INSTALL_DIR)/site-lisp $(ENDIF) - $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR) $(ENDIF) - - $(CP_DIR) icons $(INSTALL_DIR)/etc - $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF) - $(IFNOTSAMEDIR) $(CP) ../COPYING $(INSTALL_DIR) $(ENDIF) - - $(CP) ../COPYING $(INSTALL_DIR)/bin - - $(DEL) ../$(DIRNAME)_same-dir.tst - - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst - -install-other-dirs-nmake: all - cd ..\lib-src - $(MAKE) $(MFLAGS) install - cd ..\src - $(MAKE) $(MFLAGS) install - cd ..\lisp - $(MAKE) $(MFLAGS) install - cd ..\leim - $(MAKE) $(MFLAGS) install - cd ..\nt - -install-other-dirs-gmake: all - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src install - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src install - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install - -install-shortcuts: $(INSTALL_DIR)/bin - - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin - "$(INSTALL_DIR)/bin/addpm" -q - -maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE) - -maybe-copy-distfiles-CMD: create-tmp-dist-dir doit - @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin - -maybe-copy-distfiles-SH: create-tmp-dist-dir doit - @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" ] ; then \ - $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ; \ - fi - -create-tmp-dist-dir: - mkdir "$(TMP_DIST_DIR)" -# Also create bin directory for dist files. - mkdir "$(TMP_DIST_DIR)/bin" - -dist: install-bin maybe-copy-distfiles - $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR) - $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR) - $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR) - $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR) - $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR) - $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR) - $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR) - $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR) - $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR) - $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR) - $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE) - $(DEL_TREE) $(TMP_DIST_DIR) - -force-info: -# Note that doc/emacs/makefile knows how to -# put the info files in $(infodir), -# so we can do ok running make in the build dir. -info: force-info info-$(MAKETYPE) - -info-nmake: - cd ..\doc\emacs - $(MAKE) $(MFLAGS) info - cd ..\misc - $(MAKE) $(MFLAGS) info - cd ..\lispref - $(MAKE) $(MFLAGS) info - cd ..\lispintro - $(MAKE) $(MFLAGS) info - cd $(MAKEDIR) - -info-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs info - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc info - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref info - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro info -# -# Maintenance -# -clean: clean-other-dirs-$(MAKETYPE) - - $(DEL) $(COMPILER_TEMP_FILES) - - $(DEL_TREE) $(OBJDIR) - - $(DEL) stamp_BLD - - $(DEL) ../etc/DOC ../etc/DOC-X - -clean-other-dirs-nmake: - cd ..\lib - $(MAKE) $(MFLAGS) clean - cd ..\lib-src - $(MAKE) $(MFLAGS) clean - cd ..\src - $(MAKE) $(MFLAGS) clean - cd ..\doc\lispintro - $(MAKE) $(MFLAGS) clean - cd ..\lispref - $(MAKE) $(MFLAGS) clean - cd ..\..\leim - $(MAKE) $(MFLAGS) clean - cd ..\doc\emacs - $(MAKE) $(MFLAGS) clean - cd ..\misc - $(MAKE) $(MFLAGS) clean - cd ..\..\nt - -clean-other-dirs-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean - -cleanall-other-dirs-nmake: - cd ..\lib - $(MAKE) $(MFLAGS) cleanall - cd ..\lib-src - $(MAKE) $(MFLAGS) cleanall - cd ..\src - $(MAKE) $(MFLAGS) cleanall - cd ..\nt - -cleanall-other-dirs-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib cleanall - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall - -# We used to delete *~ here, but that might inadvertently remove -# precious files if it happens to match their short 8+3 aliases. -cleanall: clean cleanall-other-dirs-$(MAKETYPE) - - $(DEL_TREE) obj - - $(DEL_TREE) obj-spd - - $(DEL_TREE) oo - - $(DEL_TREE) oo-spd - -top-distclean: - - $(DEL) $(COMPILER_TEMP_FILES) - - $(DEL_TREE) obj - - $(DEL_TREE) obj-spd - - $(DEL_TREE) oo - - $(DEL_TREE) oo-spd - - $(DEL) stamp_BLD - - $(DEL) ../etc/DOC ../etc/DOC-X - - $(DEL) config.log Makefile - - $(DEL) ../README.W32 - -distclean: distclean-other-dirs-$(MAKETYPE) top-distclean - -distclean-other-dirs-nmake: - cd ..\lib - $(MAKE) $(MFLAGS) distclean - cd ..\lib-src - $(MAKE) $(MFLAGS) distclean - cd ..\src - $(MAKE) $(MFLAGS) distclean - cd ..\lisp - $(MAKE) $(MFLAGS) distclean - cd ..\leim - $(MAKE) $(MFLAGS) distclean - cd ..\doc\emacs - $(MAKE) $(MFLAGS) distclean - cd ..\misc - $(MAKE) $(MFLAGS) distclean - cd ..\lispintro - $(MAKE) $(MFLAGS) distclean - cd ..\lispref - $(MAKE) $(MFLAGS) distclean - cd ..\..\nt - -distclean-other-dirs-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib distclean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim distclean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs distclean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc distclean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro distclean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref distclean - -maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean - -maintainer-clean-other-dirs-nmake: - cd ..\lib - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\lib-src - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\src - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\lisp - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\leim - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\doc\emacs - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\misc - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\lispintro - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\lispref - $(MAKE) $(MFLAGS) maintainer-clean - cd ..\..\nt - -maintainer-clean-other-dirs-gmake: - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib maintainer-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim maintainer-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs maintainer-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc maintainer-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro maintainer-clean - $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref maintainer-clean - -realclean: cleanall - - $(DEL_TREE) ../bin - -TAGS: TAGS-$(MAKETYPE) - -frc: -TAGS-gmake: frc - ../lib-src/$(BLD)/etags $(CURDIR)/*.c - $(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP - $(MAKE) $(MFLAGS) -C ../lib-src TAGS - $(MAKE) $(MFLAGS) -C ../lib TAGS - -TAGS-nmake: - echo This target is not supported with NMake - -.PHONY: frc +# -*- Makefile -*- for GNU Emacs on the Microsoft W32 API. +# Copyright (C) 2000-2012 Free Software Foundation, Inc. +# +# Top level makefile for building GNU Emacs on Windows NT +# +# This file is part of GNU Emacs. + +# GNU Emacs is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# GNU Emacs is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with GNU Emacs. If not, see . + + +# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out +# (and remove or replace this comment). + +VERSION = 24.1.50 + +TMP_DIST_DIR = emacs-$(VERSION) + +TRES = $(BLD)/emacs.res +CLIENTRES = $(BLD)/emacsclient.res + +XMFLAGS = + +ALL = addpm ddeclient runemacs cmdproxy addsection preprep + +.PHONY: $(ALL) + + +addpm: stamp_BLD $(BLD)/addpm.exe +$(BLD)/addpm.exe: $(BLD)/addpm.$(O) + $(LINK) $(LINK_OUT)$@ \ + $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) \ + $(USER32) $(OLE32) $(UUID) $(SHELL32) + +ddeclient: stamp_BLD $(BLD)/ddeclient.exe +$(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O) + $(LINK) $(LINK_OUT)$@ \ + $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) + +cmdproxy: stamp_BLD $(BLD)/cmdproxy.exe +$(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O) + $(LINK) $(LINK_OUT)$@ \ + $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) + +addsection: stamp_BLD $(BLD)/addsection.exe +$(BLD)/addsection.exe: $(BLD)/addsection.$(O) + $(LINK) $(LINK_OUT)$@ \ + $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) + +preprep: stamp_BLD $(BLD)/preprep.exe +$(BLD)/preprep.exe: $(BLD)/preprep.$(O) + $(LINK) $(LINK_OUT)$@ \ + $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) + +# +# The resource file. NT 3.10 requires the use of cvtres; even though +# it is not necessary on later versions, it is still ok to use it. +# +$(TRES): emacs.rc icons/emacs.ico emacs.manifest stamp_BLD + $(RC) $(RC_OUT)$(TRES) emacs.rc + +$(CLIENTRES): emacsclient.rc stamp_BLD + $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc + +runemacs: stamp_BLD $(BLD)/runemacs.exe +$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) + $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \ + $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) + +which-sh: + @echo Using $(THE_SHELL) as shell. + +# These depend on stamp_BLD to make sure the $(BLD) directory is created +# before the compilation begins, even if Make runs several commands +# in parallel under "make -j". +# +$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): stamp_BLD + +# +# Build emacs +# +all: which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE) + +all-other-dirs-$(MAKETYPE): maybe-bootstrap + +all-other-dirs-nmake: addsection + cd ..\lib + $(MAKE) $(MFLAGS) all + cd ..\lib-src + $(MAKE) $(MFLAGS) all + cd ..\src + $(MAKE) $(MFLAGS) all + cd ..\lisp + $(MAKE) $(MFLAGS) all + cd ..\leim + $(MAKE) $(MFLAGS) all + cd ..\nt + +all-other-dirs-gmake: addsection + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim all + +recompile: recompile-$(MAKETYPE) + +recompile-nmake: + cd ..\lisp + $(MAKE) $(MFLAGS) recompile + cd ..\nt + +recompile-gmake: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp recompile + +#### Bootstrapping. + +### This is meant for Emacs maintainers only. It first cleans the +### lisp subdirectory, removing all compiled Lisp files. Then a +### special emacs executable is built from Lisp sources, which is then +### used to compile Lisp files. The last step is a "normal" make. + +maybe-bootstrap: maybe-bootstrap-$(SHELLTYPE) + +# dummy target to force other targets to be evaluated. +doit: + +maybe-bootstrap-CMD: doit + @echo . + @if not EXIST ..\lisp\abbrev.elc echo Essential Lisp files seem to be missing. You should either + @if not EXIST ..\lisp\abbrev.elc echo do 'make bootstrap' or create 'lisp/abbrev.elc' somehow + @echo . + @if not EXIST ..\lisp\abbrev.elc exit -1 + +maybe-bootstrap-SH: doit + @if [ ! -f ../lisp/abbrev.elc ] ; then \ + echo; \ + echo "Essential Lisp files seem to be missing. You should either"; \ + echo "do \`make bootstrap' or create \`lisp/abbrev.elc' somehow."; \ + echo; \ + exit -1; \ + fi + +# Bootstrap depends on cmdproxy because some Lisp functions +# loaded during bootstrap may need to run shell commands. +bootstrap: addsection cmdproxy bootstrap-$(MAKETYPE) + $(MAKE) $(MFLAGS) $(XMFLAGS) all + +bootstrap-nmake: addsection cmdproxy + cd ..\lisp + $(MAKE) $(MFLAGS) bootstrap-clean + cd ..\src + $(MAKE) $(MFLAGS) clean + cd ..\lib-src + $(MAKE) $(MFLAGS) clean make-docfile + cd ..\lib + $(MAKE) $(MFLAGS) clean all + cd ..\src + $(MAKE) $(MFLAGS) bootstrap + $(MAKE) $(MFLAGS) bootstrap-clean + cd ..\nt + $(CP) $(BLD)/cmdproxy.exe ../bin + cd ..\lisp + $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap + cd ..\lib-src + $(MAKE) $(MFLAGS) DOC + cd ..\nt + +bootstrap-gmake: addsection cmdproxy + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src make-docfile + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean + $(CP) $(BLD)/cmdproxy.exe ../bin + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC + +bootstrap-clean: bootstrap-clean-$(MAKETYPE) + +bootstrap-clean-nmake: + cd ..\src + $(MAKE) $(MFLAGS) bootstrap-clean + cd ..\lib + $(MAKE) $(MFLAGS) clean + cd ..\lisp + $(MAKE) $(MFLAGS) bootstrap-clean + +bootstrap-clean-gmake: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean + +$(INSTALL_DIR): + - mkdir "$(INSTALL_DIR)" + +$(INSTALL_DIR)/bin: $(INSTALL_DIR) + - mkdir "$(INSTALL_DIR)/bin" + +# +# Build and install emacs in INSTALL_DIR +# +.PHONY: install-bin install-shortcuts + +install: install-bin install-shortcuts + +install-bin: all $(INSTALL_DIR)/bin install-other-dirs-$(MAKETYPE) + - $(CP) $(BLD)/ddeclient.exe $(INSTALL_DIR)/bin + - $(CP) $(BLD)/cmdproxy.exe $(INSTALL_DIR)/bin + - $(CP) $(BLD)/runemacs.exe $(INSTALL_DIR)/bin + - $(CP) README.W32 $(INSTALL_DIR) + - $(DEL) ../$(DIRNAME)_same-dir.tst + - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst + echo SameDirTest > "$(INSTALL_DIR)/$(DIRNAME)_same-dir.tst" + - mkdir "$(INSTALL_DIR)/etc" + - mkdir "$(INSTALL_DIR)/info" + - mkdir "$(INSTALL_DIR)/lock" + - mkdir "$(INSTALL_DIR)/data" + - mkdir "$(INSTALL_DIR)/site-lisp" + - mkdir "$(INSTALL_DIR)/etc/icons" + $(IFNOTSAMEDIR) $(CP) ../site-lisp/subdirs.el $(INSTALL_DIR)/site-lisp $(ENDIF) + $(IFNOTSAMEDIR) $(CP_DIR) ../etc $(INSTALL_DIR) $(ENDIF) + - $(CP_DIR) icons $(INSTALL_DIR)/etc + $(IFNOTSAMEDIR) $(CP_DIR) ../info $(INSTALL_DIR) $(ENDIF) + $(IFNOTSAMEDIR) $(CP) ../COPYING $(INSTALL_DIR) $(ENDIF) + - $(CP) ../COPYING $(INSTALL_DIR)/bin + - $(DEL) ../$(DIRNAME)_same-dir.tst + - $(DEL) $(INSTALL_DIR)/$(DIRNAME)_same-dir.tst + +install-other-dirs-nmake: all + cd ..\lib-src + $(MAKE) $(MFLAGS) install + cd ..\src + $(MAKE) $(MFLAGS) install + cd ..\lisp + $(MAKE) $(MFLAGS) install + cd ..\leim + $(MAKE) $(MFLAGS) install + cd ..\nt + +install-other-dirs-gmake: all + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src install + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src install + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install + +install-shortcuts: $(INSTALL_DIR)/bin + - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin + "$(INSTALL_DIR)/bin/addpm" -q + +maybe-copy-distfiles: maybe-copy-distfiles-$(SHELLTYPE) + +maybe-copy-distfiles-CMD: create-tmp-dist-dir doit - @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ++ @if not $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin + +maybe-copy-distfiles-SH: create-tmp-dist-dir doit - @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE)=="" ] ; then \ ++ @if [ ! $(ARGQUOTE)$(DIST_FILES)$(ARGQUOTE) == "" ] ; then \ + $(CP_DIR) $(DIST_FILES) $(TMP_DIST_DIR)/bin ; \ + fi + +create-tmp-dist-dir: + mkdir "$(TMP_DIST_DIR)" +# Also create bin directory for dist files. + mkdir "$(TMP_DIST_DIR)/bin" + +dist: install-bin maybe-copy-distfiles + $(CP) "$(INSTALL_DIR)/BUGS" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/COPYING" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/README" $(TMP_DIST_DIR) + $(CP) "$(INSTALL_DIR)/README.W32" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/bin" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/etc" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/info" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/lisp" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/leim" $(TMP_DIST_DIR) + $(CP_DIR) "$(INSTALL_DIR)/site-lisp" $(TMP_DIST_DIR) + $(COMSPEC)$(ComSpec) /c $(ARGQUOTE)zipdist.bat $(VERSION)$(ARGQUOTE) + $(DEL_TREE) $(TMP_DIST_DIR) + +force-info: +# Note that doc/emacs/makefile knows how to +# put the info files in $(infodir), +# so we can do ok running make in the build dir. +info: force-info info-$(MAKETYPE) + +info-nmake: + cd ..\doc\emacs + $(MAKE) $(MFLAGS) info + cd ..\misc + $(MAKE) $(MFLAGS) info + cd ..\lispref + $(MAKE) $(MFLAGS) info + cd ..\lispintro + $(MAKE) $(MFLAGS) info + cd $(MAKEDIR) + +info-gmake: emacs misc lispref lispintro + +emacs misc lispref lispintro: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/$@ info + +# +# Maintenance +# +clean: clean-other-dirs-$(MAKETYPE) + - $(DEL) $(COMPILER_TEMP_FILES) + - $(DEL_TREE) $(OBJDIR) + - $(DEL) stamp_BLD + - $(DEL) ../etc/DOC ../etc/DOC-X + +clean-other-dirs-nmake: + cd ..\lib + $(MAKE) $(MFLAGS) clean + cd ..\lib-src + $(MAKE) $(MFLAGS) clean + cd ..\src + $(MAKE) $(MFLAGS) clean + cd ..\doc\lispintro + $(MAKE) $(MFLAGS) clean + cd ..\lispref + $(MAKE) $(MFLAGS) clean + cd ..\..\leim + $(MAKE) $(MFLAGS) clean + cd ..\doc\emacs + $(MAKE) $(MFLAGS) clean + cd ..\misc + $(MAKE) $(MFLAGS) clean + cd ..\..\nt + +clean-other-dirs-gmake: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref clean + +cleanall-other-dirs-nmake: + cd ..\lib + $(MAKE) $(MFLAGS) cleanall + cd ..\lib-src + $(MAKE) $(MFLAGS) cleanall + cd ..\src + $(MAKE) $(MFLAGS) cleanall + cd ..\nt + +cleanall-other-dirs-gmake: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib cleanall + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall + +# We used to delete *~ here, but that might inadvertently remove +# precious files if it happens to match their short 8+3 aliases. +cleanall: clean cleanall-other-dirs-$(MAKETYPE) + - $(DEL_TREE) obj + - $(DEL_TREE) obj-spd + - $(DEL_TREE) oo + - $(DEL_TREE) oo-spd + +top-distclean: + - $(DEL) $(COMPILER_TEMP_FILES) + - $(DEL_TREE) obj + - $(DEL_TREE) obj-spd + - $(DEL_TREE) oo + - $(DEL_TREE) oo-spd + - $(DEL) stamp_BLD + - $(DEL) ../etc/DOC ../etc/DOC-X + - $(DEL) config.log Makefile + - $(DEL) ../README.W32 + +distclean: distclean-other-dirs-$(MAKETYPE) top-distclean + +distclean-other-dirs-nmake: + cd ..\lib + $(MAKE) $(MFLAGS) distclean + cd ..\lib-src + $(MAKE) $(MFLAGS) distclean + cd ..\src + $(MAKE) $(MFLAGS) distclean + cd ..\lisp + $(MAKE) $(MFLAGS) distclean + cd ..\leim + $(MAKE) $(MFLAGS) distclean + cd ..\doc\emacs + $(MAKE) $(MFLAGS) distclean + cd ..\misc + $(MAKE) $(MFLAGS) distclean + cd ..\lispintro + $(MAKE) $(MFLAGS) distclean + cd ..\lispref + $(MAKE) $(MFLAGS) distclean + cd ..\..\nt + +distclean-other-dirs-gmake: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro distclean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref distclean + +maintainer-clean: maintainer-clean-other-dirs-$(MAKETYPE) top-distclean + +maintainer-clean-other-dirs-nmake: + cd ..\lib + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\lib-src + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\src + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\lisp + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\leim + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\doc\emacs + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\misc + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\lispintro + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\lispref + $(MAKE) $(MFLAGS) maintainer-clean + cd ..\..\nt + +maintainer-clean-other-dirs-gmake: + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/emacs maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/misc maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispintro maintainer-clean + $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../doc/lispref maintainer-clean + +realclean: cleanall + - $(DEL_TREE) ../bin + +TAGS: TAGS-$(MAKETYPE) + +frc: +TAGS-gmake: frc + ../lib-src/$(BLD)/etags $(CURDIR)/*.c + $(MAKE) $(MFLAGS) -C ../src TAGS TAGS-LISP + $(MAKE) $(MFLAGS) -C ../lib-src TAGS + $(MAKE) $(MFLAGS) -C ../lib TAGS + +TAGS-nmake: + echo This target is not supported with NMake + +.PHONY: frc diff --cc src/ChangeLog index c23585bdab7,73c67125257..6d2ed01bafc --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,49 -1,8 +1,64 @@@ -2012-04-13 Atsuo Ohki (tiny change) ++2012-04-14 Atsuo Ohki (tiny change) + - * lread.c (lisp_file_lexically_bound_p): Fix hang at ";-*-\n" (bug#11238). ++ * lread.c (lisp_file_lexically_bound_p): ++ Fix hang at ";-*-\n" (bug#11238). + -2012-04-10 Teodor Zlatanov ++2012-04-14 Eli Zaretskii ++ ++ * xdisp.c (find_last_unchanged_at_beg_row): Don't consider a row ++ "unchanged" if its end.pos is beyond ZV. (Bug#11199) ++ ++2012-04-14 Jan Djärv ++ ++ * nsterm.m (constrainFrameRect): Always constrain when there is only ++ one screen (Bug#10962). ++ +2012-04-13 Ken Brown + + * s/cygwin.h (PTY_OPEN): Don't try to close a bogus file descriptor. + +2012-04-13 Reuben Thomas + + * indent.c (Fmove_to_column): Change interactive spec (Bug#739). + +2012-04-11 Daniel Colascione + + * s/cygwin.h: The vfork the #define in cygwin.h was protecting + against is gone. It's better to use vfork now so that when Cygwin + gains a new, working vfork, we use it automatically (bug#10398). + +2012-04-11 Stefan Monnier + + * window.c (save_window_save): Obey window-point-insertion-type. + +2012-04-11 Glenn Morris + + * Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. + +2012-04-11 Stefan Monnier + + * alloc.c (lisp_align_malloc): Remove unneeded prototype. + +2012-04-10 "Jason S. Cornez" (tiny change) + + * keyboard.c: Override inhibit-quit after the third C-g (bug#6585). + (force_quit_count): New var. + (handle_interrupt): Use it. + +2012-04-10 Juanma Barranquero + + * w32.c (w32_delayed_load): Record the full path of the library + being loaded (bug#10424). + +2012-04-09 Glenn Morris + + * doc.c (Fsnarf_documentation): Check variables, functions are bound, + not just in the obarray, before snarfing them. (Bug#11036) + + * Makefile.in ($(leimdir)/leim-list.el): + Pass EMACS rather than BUILT_EMACS. + +2012-04-09 Teodor Zlatanov * process.c (make_process): * process.h: Add integer `gnutls_handshakes_tried' member to