Now on revision 107751. ------------------------------------------------------------ revno: 107751 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-03 22:11:56 -0400 message: admin/notes/tags small update diff: === modified file 'admin/notes/tags' --- admin/notes/tags 2012-04-03 20:03:34 +0000 +++ admin/notes/tags 2012-04-04 02:11:56 +0000 @@ -5,6 +5,9 @@ http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00042.html +(UPDATE: It seems tag deletion is basically impossible in bzr, so all +these tags came back.) + In the unlikely event that you need them, the removed tags were: tag revision ------------------------------------------------------------ revno: 107750 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-03 21:44:33 -0400 message: Small edits for doc/emacs/glossary.texi * doc/emacs/glossary.texi (Glossary): Copyedits. Use Texinfo-recommended convention for quotes and punctuation. Comment out a few specialized (Rmail) items. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-04-03 10:21:47 +0000 +++ doc/emacs/ChangeLog 2012-04-04 01:44:33 +0000 @@ -1,3 +1,9 @@ +2012-04-04 Glenn Morris + + * glossary.texi (Glossary): Copyedits. + Use Texinfo-recommended convention for quotes and punctuation. + Comment out a few specialized (Rmail) items. + 2012-04-03 Chong Yidong * sending.texi (Mail Misc): Fix an index entry. === modified file 'doc/emacs/glossary.texi' --- doc/emacs/glossary.texi 2012-01-19 07:21:25 +0000 +++ doc/emacs/glossary.texi 2012-04-04 01:44:33 +0000 @@ -7,7 +7,7 @@ @table @asis @item Abbrev -An abbrev is a text string which expands into a different text string +An abbrev is a text string that expands into a different text string when present in the buffer. For example, you might define a few letters as an abbrev for a long phrase that you want to insert frequently. @xref{Abbrevs}. @@ -26,7 +26,7 @@ Input, Alt}. @item Argument -See `numeric argument.' +See `numeric argument'. @item @acronym{ASCII} character An @acronym{ASCII} character is either an @acronym{ASCII} control @@ -38,7 +38,7 @@ @item @acronym{ASCII} printing character @acronym{ASCII} printing characters include letters, digits, space, and these -punctuation characters: @samp{!@@#$%^& *()_-+=|\~` @{@}[]:;"' <>,.?/}. +punctuation characters: @samp{!@@#$%^&*()_-+=|\~`@{@}[]:;"'<>,.?/}. @item Auto Fill Mode Auto Fill mode is a minor mode (q.v.@:) in which text that you insert is @@ -53,7 +53,7 @@ @item Autoloading Emacs can automatically load Lisp libraries when a Lisp program requests a -function from those libraries. This is called `autoloading.' +function from those libraries. This is called `autoloading'. @xref{Lisp Libraries}. @item Backtrace @@ -72,8 +72,8 @@ manually or automatically. You do manual balancing with the commands to move over parenthetical groupings (@pxref{Moving by Parens}). Automatic balancing works by blinking or highlighting the delimiter -that matches the one you just inserted (@pxref{Matching,,Matching -Parens}). +that matches the one you just inserted, or inserting the matching +delimiter for you (@pxref{Matching,,Matching Parens}). @item Balanced Expressions A balanced expression is a syntactically recognizable expression, such @@ -81,7 +81,7 @@ in C. @xref{Expressions,Balanced Expressions}. @item Balloon Help -See `tooltips.' +See `tooltips'. @item Base Buffer A base buffer is a buffer whose text is shared by an indirect buffer @@ -100,12 +100,12 @@ @item Blank Lines Blank lines are lines that contain only whitespace. Emacs has several -commands for operating on the blank lines in the buffer. +commands for operating on the blank lines in the buffer. @xref{Blank Lines}. @item Bookmark Bookmarks are akin to registers (q.v.@:) in that they record positions in buffers to which you can return later. Unlike registers, bookmarks -persist between Emacs sessions. +persist between Emacs sessions. @xref{Bookmarks}. @item Border A border is a thin space along the edge of the frame, used just for @@ -118,13 +118,13 @@ @item Buffer The buffer is the basic editing unit; one buffer corresponds to one text -being edited. You can have several buffers, but at any time you are -editing only one, the `current buffer,' though several can be visible +being edited. You normally have several buffers, but at any time you are +editing only one, the `current buffer', though several can be visible when you are using multiple windows or frames (q.v.@:). Most buffers are visiting (q.v.@:) some file. @xref{Buffers}. @item Buffer Selection History -Emacs keeps a buffer selection history which records how recently each +Emacs keeps a buffer selection history that records how recently each Emacs buffer has been selected. This is used for choosing a buffer to select. @xref{Buffers}. @@ -139,10 +139,10 @@ right away when you press down on a mouse button. @xref{Mouse Buttons}. @item By Default -See `default.' +See `default'. @item Byte Compilation -See `compilation.' +See `compilation'. @item @kbd{C-} @kbd{C-} in the name of a character is an abbreviation for Control. @@ -156,7 +156,7 @@ @item Case Conversion Case conversion means changing text from upper case to lower case or -vice versa. @xref{Case}, for the commands for case conversion. +vice versa. @xref{Case}. @item Character Characters form the contents of an Emacs buffer. Also, key sequences @@ -168,7 +168,7 @@ particular alphabet or script. @xref{International}. @item Character Terminal -See `text-only terminal.' +See `text-only terminal'. @item Click Event A click event is the kind of input event (q.v.@:) generated when you @@ -195,10 +195,10 @@ the command to run. @xref{Commands}. @item Command History -See `minibuffer history.' +See `minibuffer history'. @item Command Name -A command name is the name of a Lisp symbol which is a command +A command name is the name of a Lisp symbol that is a command (@pxref{Commands}). You can invoke any command by its name using @kbd{M-x} (@pxref{M-x,M-x,Running Commands by Name}). @@ -221,7 +221,7 @@ (@pxref{Compilation}). @item Complete Key -A complete key is a key sequence which fully specifies one action to be +A complete key is a key sequence that fully specifies one action to be performed by Emacs. For example, @kbd{X} and @kbd{C-f} and @kbd{C-x m} are complete keys. Complete keys derive their meanings from being bound (q.v.@:) to commands (q.v.@:). Thus, @kbd{X} is conventionally bound to @@ -264,7 +264,7 @@ @item @key{CTRL} The @key{CTRL} or ``control'' key is what you hold down -in order to enter a control character (q.v.). See also `@kbd{C-}.' +in order to enter a control character (q.v.). See also `@kbd{C-}'. @item Current Buffer The current buffer in Emacs is the Emacs buffer on which most editing @@ -289,7 +289,7 @@ (called point; q.v.@:) at which insertion and deletion takes place. The cursor is on or under the character that follows point. Often people speak of `the cursor' when, strictly speaking, they mean -`point.' @xref{Point,Cursor}. +`point'. @xref{Point,Cursor}. @item Customization Customization is making minor changes in the way Emacs works, to @@ -299,7 +299,7 @@ @cindex cut and paste @item Cut and Paste -See `killing' and `yanking.' +See `killing' and `yanking'. @item Daemon A daemon is a standard term for a system-level process that runs in the @@ -315,13 +315,13 @@ @xref{Minibuffer}. @item Default -A default is the value that is used for a certain purpose if and when -you do not specify a value to use. +A default is the value that is used for a certain purpose when +you do not explicitly specify a value to use. @item Default Directory When you specify a file name that does not start with @samp{/} or @samp{~}, it is interpreted relative to the current buffer's default directory. -(On MS-Windows and MS-DOS, file names which start with a drive letter +(On MS systems, file names that start with a drive letter @samp{@var{x}:} are treated as absolute, not relative.) @xref{Minibuffer File,Default Directory}. @@ -361,11 +361,11 @@ @item Directory File directories are named collections in the file system, within which you can place individual files or subdirectories. They are sometimes -referred to as ``folders.'' @xref{Directories}. +referred to as ``folders''. @xref{Directories}. @item Dired Dired is the Emacs facility that displays the contents of a file -directory and allows you to ``edit the directory,'' performing +directory and allows you to ``edit the directory'', performing operations on the files in the directory. @xref{Dired}. @item Disabled Command @@ -421,7 +421,7 @@ @xref{Environment}. @item EOL -See `end of line.' +See `end of line'. @item Error An error occurs when an Emacs command cannot execute in the current @@ -446,7 +446,7 @@ it applies to the next character you type. @item Expression -See `balanced expression.' +See `balanced expression'. @item Expunging Expunging an Rmail, Gnus newsgroup, or Dired buffer is an operation @@ -496,7 +496,7 @@ Filling text means adjusting the position of line-breaks to shift text between consecutive lines, so that all the lines are approximately the same length. @xref{Filling}. Some other editors call this feature -`line wrapping.' +`line wrapping'. @item Font Lock Font Lock is a mode that highlights parts of buffer text in different @@ -510,7 +510,7 @@ fontset, rather than changing each font separately. @xref{Fontsets}. @item Formfeed Character -See `page.' +See `page'. @item Frame A frame is a rectangular cluster of Emacs windows. Emacs starts out @@ -539,7 +539,7 @@ special face (q.v.@:) called @code{fringe}. @xref{Faces,fringe}. @item FSF -See `Free Software Foundation.' +See `Free Software Foundation'. @item FTP FTP is an acronym for File Transfer Protocol. This is one standard @@ -551,7 +551,7 @@ @item Global Global means ``independent of the current environment; in effect -throughout Emacs.'' It is the opposite of local (q.v.@:). Particular +throughout Emacs''. It is the opposite of local (q.v.@:). Particular examples of the use of `global' appear below. @item Global Abbrev @@ -605,7 +605,7 @@ Emacs uses highlighting in several ways. It highlights the region whenever it is active (@pxref{Mark}). Incremental search also -highlights matches (@pxref{Incremental Search}). See also `font lock.' +highlights matches (@pxref{Incremental Search}). See also `font lock'. @item Hardcopy Hardcopy means printed output. Emacs has various commands for @@ -644,7 +644,7 @@ @kbd{Hyper-} (usually written @kbd{H-} for short). @xref{User Input}. @item Iff -``Iff'' means ``if and only if.'' This terminology comes from +``Iff'' means ``if and only if''. This terminology comes from mathematics. Try to avoid using this term in documentation, since many are unfamiliar with it and mistake it for a typo. @@ -694,14 +694,14 @@ @xref{Interlocking,Interlocking,Simultaneous Editing}. @item Isearch -See `incremental search.' +See `incremental search'. @item Justification Justification means adding extra spaces within lines of text in order to adjust the position of the text edges. @xref{Fill Commands}. @item Key Binding -See `binding.' +See `binding'. @item Keyboard Macro Keyboard macros are a way of defining new Emacs commands from @@ -713,8 +713,8 @@ @cindex keyboard shortcuts @item Keyboard Shortcut A keyboard shortcut is a key sequence (q.v.@:) which invokes a -command. What some programs call ``assigning a keyboard shortcut,'' -Emacs calls ``binding a key sequence.'' See `binding.' +command. What some programs call ``assigning a keyboard shortcut'', +Emacs calls ``binding a key sequence''. See `binding'. @item Key Sequence A key sequence (key, for short) is a sequence of input events (q.v.@:) @@ -740,7 +740,7 @@ @item Killing Killing means erasing text and saving it on the kill ring so it can be -yanked (q.v.@:) later. Some other systems call this ``cutting.'' +yanked (q.v.@:) later. Some other systems call this ``cutting''. Most Emacs commands that erase text perform killing, as opposed to deletion (q.v.@:). @xref{Killing}. @@ -756,7 +756,7 @@ non-@acronym{ASCII} text (@pxref{International}). @item Line Wrapping -See `filling.' +See `filling'. @item Lisp Lisp is a programming language. Most of Emacs is written in a dialect @@ -844,7 +844,7 @@ a keyboard interface to navigate it. @xref{Menu Bars}. @item Message -See `mail.' +See `mail'. @item Meta Meta is the name of a modifier bit which you can use in a command @@ -924,13 +924,13 @@ @item Newline Control-J characters in the buffer terminate lines of text and are -therefore also called newlines. See `End of Line.' +therefore also called newlines. See `End of Line'. @cindex nil @cindex t @item @code{nil} -@code{nil} is a value usually interpreted as a logical ``false.'' Its -opposite is @code{t}, interpreted as ``true.'' +@code{nil} is a value usually interpreted as a logical ``false''. Its +opposite is @code{t}, interpreted as ``true''. @item Numeric Argument A numeric argument is a number, specified before a command, to change @@ -965,7 +965,7 @@ point. @xref{Point}. @item Prefix Argument -See `numeric argument.' +See `numeric argument'. @item Prefix Key A prefix key is a key sequence (q.v.@:) whose sole function is to @@ -973,10 +973,13 @@ prefix key; any two-character sequence starting with @kbd{C-x} is therefore a legitimate key sequence. @xref{Keys}. +@c I don't think this kind of thing needs to be here. +@ignore @item Primary Rmail File Your primary Rmail file is the file named @samp{RMAIL} in your home directory. That's where Rmail stores your incoming mail, unless you specify a different file name. @xref{Rmail}. +@end ignore @item Primary Selection The primary selection is one particular X selection (q.v.@:); it is the @@ -1042,7 +1045,7 @@ @xref{Screen,Redisplay}. @item Regexp -See `regular expression.' +See `regular expression'. @item Region The region is the text between point (q.v.@:) and the mark (q.v.@:). @@ -1066,10 +1069,10 @@ @xref{Remote Files}. @item Repeat Count -See `numeric argument.' +See `numeric argument'. @item Replacement -See `global substitution.' +See `global substitution'. @item Restriction A buffer's restriction is the amount of text, at the beginning or the @@ -1086,9 +1089,13 @@ Reverting means returning to the original state. Emacs lets you revert a buffer by re-reading its file from disk. @xref{Reverting}. +@c Seems too obvious, also there is nothing special about the format +@c these days. +@ignore @item Rmail File An Rmail file is a file containing text in the format used by Rmail for storing mail. @xref{Rmail}. +@end ignore @item Saving Saving a buffer means copying its text into the file that was visited @@ -1198,10 +1205,10 @@ allowed as well. @item String Substitution -See `global substitution.' +See `global substitution'. @item Syntax Highlighting -See `font lock.' +See `font lock'. @item Syntax Table The syntax table tells Emacs which characters are part of a word, @@ -1287,11 +1294,11 @@ @item Truncation Truncating text lines in the display means leaving out any text on a line that does not fit within the right margin of the window -displaying it. See also `continuation line.' +displaying it. See also `continuation line'. @xref{Continuation Lines,Truncation}. @item TTY -See `text-only terminal.' +See `text-only terminal'. @item Undoing Undoing means making your previous editing go in reverse, bringing @@ -1350,7 +1357,7 @@ include a window system. @item Word Abbrev -See `abbrev.' +See `abbrev'. @item Word Search Word search is searching for a sequence of words, considering the @@ -1359,5 +1366,5 @@ @item Yanking Yanking means reinserting text previously killed (q.v.@:). It can be used to undo a mistaken kill, or for copying or moving text. Some -other systems call this ``pasting.'' @xref{Yanking}. +other systems call this ``pasting''. @xref{Yanking}. @end table ------------------------------------------------------------ revno: 107749 committer: Daiki Ueno branch nick: trunk timestamp: Wed 2012-04-04 10:38:37 +0900 message: epa: bind C-c C-c to finish key selection. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-04 01:05:29 +0000 +++ lisp/ChangeLog 2012-04-04 01:38:37 +0000 @@ -1,3 +1,10 @@ +2012-04-04 Daiki Ueno + + * epa.el (epa--select-keys): Bind C-c C-c to finish the key + selection (Bug#11159). + (epa-insert-keys): Inform that the default public key will be + exported if no key is selected. + 2012-04-04 Richard Stallman * mail/emacsbug.el (report-emacs-bug): Bind inhibit-read-only. === modified file 'lisp/epa.el' --- lisp/epa.el 2012-01-19 07:21:25 +0000 +++ lisp/epa.el 2012-04-04 01:38:37 +0000 @@ -482,6 +482,8 @@ (setq epa-keys-buffer (generate-new-buffer "*Keys*"))) (with-current-buffer epa-keys-buffer (epa-key-list-mode) + ;; C-c C-c is the usual way to finish the selection (bug#11159). + (define-key (current-local-map) "\C-c\C-c" 'exit-recursive-edit) (let ((inhibit-read-only t) buffer-read-only) (erase-buffer) @@ -1236,7 +1238,8 @@ "Insert selected KEYS after the point." (interactive (list (epa-select-keys (epg-make-context epa-protocol) - "Select keys to export. "))) + "Select keys to export. +If no one is selected, default public key is exported. "))) (let ((context (epg-make-context epa-protocol))) ;;(epg-context-set-armor context epa-armor) (epg-context-set-armor context t) ------------------------------------------------------------ revno: 107748 committer: Richard Stallman branch nick: trunk timestamp: Tue 2012-04-03 21:05:29 -0400 message: report-emacs-bug: cope with read-only signature. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-03 10:21:47 +0000 +++ lisp/ChangeLog 2012-04-04 01:05:29 +0000 @@ -1,3 +1,7 @@ +2012-04-04 Richard Stallman + + * mail/emacsbug.el (report-emacs-bug): Bind inhibit-read-only. + 2012-04-03 Chong Yidong * mail/sendmail.el (mail-mode-map): Bind C-c C-i to === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2012-03-04 13:34:33 +0000 +++ lisp/mail/emacsbug.el 2012-04-04 01:05:29 +0000 @@ -182,7 +182,9 @@ (set (make-local-variable 'message-strip-special-text-properties) nil)) (rfc822-goto-eoh) (forward-line 1) - (let ((signature (buffer-substring (point) (point-max)))) + ;; Move the mail signature to the proper place. + (let ((signature (buffer-substring (point) (point-max))) + (inhibit-read-only t)) (delete-region (point) (point-max)) (insert signature) (backward-char (length signature))) ------------------------------------------------------------ revno: 107747 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-04-03 16:03:34 -0400 message: New admin/notes file diff: === added file 'admin/notes/tags' --- admin/notes/tags 1970-01-01 00:00:00 +0000 +++ admin/notes/tags 2012-04-03 20:03:34 +0000 @@ -0,0 +1,1003 @@ +Prior to 2012/04, the Emacs repository used to contain many more tags. +Apparently these date from ye olden days, when tags were common +to several GNU projects. So many of them had no relevance to Emacs, +and hence were removed. See: + +http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00042.html + +In the unlikely event that you need them, the removed tags were: + +tag revision + +amigados-merge 14846 +before-thomas-posix1996 16843 +gcc-2_8_1-980401 20893 +gcc-2_8_1-980402 21795 +gcc-2_8_1-980407 20893 +gcc-2_8_1-980412 20893 +gcc-2_8_1-980413 20893 +gcc-2_8_1-980419 21502 +gcc-2_8_1-980426 21502 +gcc-2_8_1-980502 21795 +gcc-2_8_1-980513 21795 +gcc-2_8_1-980525 22147 +gcc-2_8_1-980529 22147 +gcc-2_8_1-980608 22147 +gcc-2_8_1-980609 22147 +gcc-2_8_1-980627 22478 +gcc-2_8_1-980705 22478 +gcc-2_8_1-980718 22478 +gcc-2_8_1-980811 22971 +gcc-2_8_1-980813 23005 +gcc-2_8_1-980928 23338 +gcc-2_8_1-980929 23338 +gcc-2_8_1-RELEASE 20893 +gcc_2_8_1-980315 20893 +gcc_2_8_1-980929 23338 +glibc-2_0_2 16843 +gnumach-release-1-1 17693 +gnumach-release-1-1-1 17693 +gnumach-release-1-1-2 18209 +gnumach-release-1-1-3 18209 +hurd-release-0-2 18209 +jimb-sync-Nov-3-1992 1552 +libc20x-97031 16843 +libc20x-970306 16843 +libc20x-970316 16843 +libc20x-970318 16843 +libc20x-970319 16843 +libc20x-970404 16843 +libc-1-90 15360 +libc-1-91 15451 +libc-1-92 15463 +libc-1-93 15702 +libc-950402 11085 +libc-950411 11255 +libc-950722 12418 +libc-950723 12418 +libc-950922 12859 +libc-951016 12859 +libc-951018 13231 +libc-951029 13231 +libc-951031 13231 +libc-951101 13231 +libc-951102 13231 +libc-951103 13231 +libc-951104 13231 +libc-951105 13231 +libc-951106 13231 +libc-951107 13231 +libc-951108 13231 +libc-951109 13231 +libc-951110 13231 +libc-951111 13231 +libc-951112 13231 +libc-951113 13231 +libc-951114 13231 +libc-951115 13231 +libc-951116 13231 +libc-951117 13231 +libc-951118 13231 +libc-951119 13231 +libc-951120 13231 +libc-951121 13231 +libc-951122 13231 +libc-951123 13231 +libc-951124 13231 +libc-951125 13231 +libc-951126 13231 +libc-951127 13231 +libc-951128 13231 +libc-951129 13231 +libc-951130 13231 +libc-951201 13679 +libc-951202 13679 +libc-951203 13679 +libc-951204 13679 +libc-951206 13686 +libc-951208 13693 +libc-951209 13693 +libc-951210 13693 +libc-951211 13693 +libc-951212 13704 +libc-951213 13704 +libc-951214 13730 +libc-951215 13730 +libc-951216 13741 +libc-951217 13741 +libc-951218 13741 +libc-951219 13741 +libc-951220 13741 +libc-951221 13741 +libc-951222 13741 +libc-951223 13741 +libc-951224 13741 +libc-951225 13741 +libc-951226 13741 +libc-951227 13741 +libc-951228 13741 +libc-951229 13741 +libc-951230 13741 +libc-951231 13741 +libc-960101 13741 +libc-960102 13741 +libc-960103 13741 +libc-960104 13741 +libc-960105 13741 +libc-960106 13741 +libc-960107 13741 +libc-960108 13741 +libc-960109 13741 +libc-960110 13741 +libc-960111 13741 +libc-960112 13741 +libc-960113 13741 +libc-960114 13741 +libc-960115 13741 +libc-960116 14192 +libc-960117 14192 +libc-960118 14213 +libc-960119 14213 +libc-960120 14213 +libc-960121 14213 +libc-960122 14213 +libc-960123 14213 +libc-960124 14213 +libc-960125 14213 +libc-960126 14213 +libc-960127 14213 +libc-960128 14213 +libc-960129 14213 +libc-960130 14213 +libc-960131 14213 +libc-960201 14449 +libc-960202 14449 +libc-960203 14473 +libc-960204 14473 +libc-960205 14473 +libc-960206 14473 +libc-960207 14473 +libc-960208 14473 +libc-960209 14473 +libc-960210 14473 +libc-960211 14540 +libc-960212 14548 +libc-960213 14562 +libc-960214 14562 +libc-960215 14562 +libc-960216 14562 +libc-960217 14562 +libc-960218 14562 +libc-960219 14562 +libc-960220 14562 +libc-960221 14562 +libc-960222 14562 +libc-960223 14562 +libc-960224 14562 +libc-960225 14562 +libc-960226 14562 +libc-960227 14562 +libc-960228 14562 +libc-960229 14562 +libc-960302 14724 +libc-960303 14724 +libc-960304 14724 +libc-960305 14753 +libc-960306 14764 +libc-960307 14764 +libc-960308 14764 +libc-960309 14764 +libc-960310 14764 +libc-960311 14764 +libc-960312 14764 +libc-960313 14764 +libc-960314 14764 +libc-960315 14809 +libc-960316 14809 +libc-960317 14809 +libc-960318 14809 +libc-960319 14809 +libc-960320 14809 +libc-960321 14809 +libc-960322 14855 +libc-960323 14855 +libc-960324 14855 +libc-960325 14855 +libc-960326 14855 +libc-960327 14855 +libc-960328 14855 +libc-960329 14912 +libc-960330 14912 +libc-960331 14912 +libc-960401 14912 +libc-960402 14912 +libc-960403 14912 +libc-960404 14912 +libc-960405 14912 +libc-960406 14912 +libc-960407 14912 +libc-960408 14912 +libc-960409 14962 +libc-960410 14962 +libc-960411 14962 +libc-960412 14962 +libc-960413 15014 +libc-960414 15014 +libc-960415 15014 +libc-960416 15014 +libc-960417 15014 +libc-960418 15014 +libc-960419 15014 +libc-960420 15014 +libc-960421 15014 +libc-960422 15014 +libc-960423 15014 +libc-960424 15014 +libc-960425 15014 +libc-960426 15014 +libc-960427 15014 +libc-960428 15014 +libc-960429 15014 +libc-960430 15014 +libc-960501 15014 +libc-960502 15014 +libc-960503 15014 +libc-960504 15014 +libc-960505 15014 +libc-960506 15014 +libc-960507 15014 +libc-960508 15014 +libc-960509 15014 +libc-960510 15014 +libc-960511 15014 +libc-960512 15014 +libc-960513 15014 +libc-960514 15014 +libc-960515 15014 +libc-960516 15014 +libc-960517 15014 +libc-960518 15014 +libc-960519 15014 +libc-960520 15014 +libc-960521 15261 +libc-960522 15278 +libc-960523 15278 +libc-960524 15278 +libc-960525 15287 +libc-960526 15287 +libc-960527 15287 +libc-960528 15287 +libc-960529 15287 +libc-960530 15287 +libc-960531 15287 +libc-960601 15287 +libc-960602 15287 +libc-960603 15287 +libc-960604 15319 +libc-960605 15334 +libc-960606 15334 +libc-960607 15334 +libc-960608 15360 +libc-960609 15360 +libc-960610 15360 +libc-960611 15360 +libc-960612 15360 +libc-960613 15360 +libc-960614 15360 +libc-960615 15360 +libc-960616 15360 +libc-960617 15360 +libc-960618 15360 +libc-960619 15451 +libc-960620 15451 +libc-960621 15463 +libc-960622 15463 +libc-960623 15463 +libc-960624 15463 +libc-960625 15463 +libc-960626 15463 +libc-960627 15463 +libc-960628 15463 +libc-960629 15554 +libc-960630 15554 +libc-960701 15554 +libc-960702 15554 +libc-960703 15554 +libc-960704 15554 +libc-960705 15554 +libc-960706 15554 +libc-960707 15554 +libc-960708 15620 +libc-960709 15620 +libc-960710 15620 +libc-960711 15620 +libc-960712 15620 +libc-960713 15620 +libc-960714 15620 +libc-960715 15673 +libc-960716 15702 +libc-960717 15702 +libc-960718 15702 +libc-960719 15702 +libc-960720 15702 +libc-960721 15702 +libc-960722 15702 +libc-960723 15702 +libc-960724 15702 +libc-960725 15702 +libc-960726 15702 +libc-960727 15702 +libc-960728 15702 +libc-960729 15702 +libc-960730 15702 +libc-960731 15702 +libc-960801 15702 +libc-960802 15702 +libc-960803 15702 +libc-960804 15702 +libc-960805 15702 +libc-960806 15702 +libc-960807 15702 +libc-960808 15702 +libc-960809 15702 +libc-960810 15702 +libc-960811 15702 +libc-960812 15702 +libc-960813 15702 +libc-960814 15702 +libc-960815 15702 +libc-960816 15702 +libc-960817 15702 +libc-960818 15702 +libc-960819 15702 +libc-960820 15702 +libc-960821 15702 +libc-960822 15702 +libc-960823 15702 +libc-960824 15702 +libc-960825 15702 +libc-960826 15702 +libc-960827 15702 +libc-960828 15702 +libc-960829 15702 +libc-960830 15702 +libc-960831 15702 +libc-960901 15702 +libc-960902 15702 +libc-960903 15702 +libc-960904 15702 +libc-960905 15702 +libc-960906 15702 +libc-960907 15702 +libc-960908 15702 +libc-960909 15702 +libc-960910 15702 +libc-960911 15702 +libc-960912 15702 +libc-960913 16178 +libc-960918 16190 +libc-960919 16190 +libc-960920 16190 +libc-960921 16190 +libc-960922 16190 +libc-960923 16190 +libc-960925 16307 +libc-960926 16307 +libc-960927 16307 +libc-960928 16307 +libc-960929 16307 +libc-961001 16307 +libc-961004 16307 +libc-961005 16307 +libc-961006 16307 +libc-961007 16307 +libc-961008 16307 +libc-961009 16307 +libc-961010 16307 +libc-961011 16307 +libc-961012 16307 +libc-961013 16307 +libc-961014 16307 +libc-961015 16307 +libc-961016 16307 +libc-961017 16307 +libc-961018 16307 +libc-961019 16307 +libc-961020 16307 +libc-961021 16307 +libc-961022 16307 +libc-961023 16307 +libc-961024 16307 +libc-961025 16307 +libc-961026 16307 +libc-961027 16307 +libc-961028 16307 +libc-961029 16482 +libc-961030 16482 +libc-961031 16482 +libc-961101 16482 +libc-961102 16482 +libc-961103 16482 +libc-961104 16482 +libc-961105 16482 +libc-961106 16482 +libc-961107 16482 +libc-961108 16540 +libc-961109 16540 +libc-961110 16540 +libc-961111 16540 +libc-961114 16576 +libc-961115 16576 +libc-961116 16576 +libc-961117 16576 +libc-961118 16576 +libc-961119 16576 +libc-961120 16601 +libc-961121 16602 +libc-961203 16607 +libc-961204 16607 +libc-961205 16607 +libc-961206 16607 +libc-961207 16607 +libc-961208 16638 +libc-961209 16638 +libc-961210 16638 +libc-961211 16664 +libc-961212 16664 +libc-961213 16664 +libc-961214 16664 +libc-961215 16664 +libc-961216 16664 +libc-961217 16664 +libc-961218 16664 +libc-961219 16664 +libc-961220 16664 +libc-961221 16664 +libc-961222 16664 +libc-961223 16664 +libc-961224 16664 +libc-961225 16664 +libc-961226 16664 +libc-961227 16664 +libc-961228 16664 +libc-961229 16664 +libc-961230 16664 +libc-961231 16664 +libc-970101 16802 +libc-970102 16802 +libc-970103 16802 +libc-970104 16821 +libc-970105 16833 +libc-970106 16833 +libc-970107 16833 +libc-970108 16843 +libc-970109 16843 +libc-970110 16843 +libc-970111 16843 +libc-970112 16843 +libc-970113 16843 +libc-970114 16843 +libc-970115 16843 +libc-970116 16843 +libc-970117 16843 +libc-970118 16843 +libc-970119 16843 +libc-970120 16843 +libc-970121 16843 +libc-970122 16843 +libc-970123 16843 +libc-970124 16843 +libc-970125 16843 +libc-970126 16843 +libc-970127 16843 +libc-970128 16843 +libc-970129 16843 +libc-970130 16843 +libc-970131 16843 +libc-970201 16843 +libc-970202 16843 +libc-970203 16843 +libc-970204 16843 +libc-970205 16843 +libc-970206 16843 +libc-970207 16843 +libc-970208 16843 +libc-970209 16843 +libc-970210 16843 +libc-970211 16843 +libc-970212 16843 +libc-970213 16843 +libc-970214 16843 +libc-970215 16843 +libc-970216 16843 +libc-970217 16843 +libc-970218 16843 +libc-970219 16843 +libc-970220 16843 +libc-970221 16843 +libc-970222 16843 +libc-970223 16843 +libc-970224 16843 +libc-970225 16843 +libc-970226 16843 +libc-970227 16843 +libc-970228 16843 +libc-970301 16843 +libc-970302 16843 +libc-970303 16843 +libc-970304 16843 +libc-970305 16843 +libc-970306 16843 +libc-970307 16843 +libc-970308 16843 +libc-970309 16843 +libc-970310 16843 +libc-970311 16843 +libc-970312 16843 +libc-970313 16843 +libc-970314 16843 +libc-970315 16843 +libc-970316 16843 +libc-970317 16843 +libc-970318 16843 +libc-970319 16843 +libc-970320 16843 +libc-970321 16843 +libc-970322 16843 +libc-970323 16843 +libc-970324 16843 +libc-970325 17242 +libc-970326 17242 +libc-970327 17242 +libc-970328 17242 +libc-970329 17242 +libc-970330 17242 +libc-970331 17242 +libc-970401 17242 +libc-970402 17242 +libc-970403 17242 +libc-970404 17242 +libc-970405 17242 +libc-970406 17242 +libc-970407 17242 +libc-970408 17242 +libc-970409 17242 +libc-970410 17242 +libc-970411 17242 +libc-970412 17404 +libc-970413 17404 +libc-970414 17404 +libc-970415 17404 +libc-970416 17404 +libc-970417 17404 +libc-970418 17500 +libc-970419 17500 +libc-970420 17500 +libc-970421 17500 +libc-970422 17500 +libc-970423 17500 +libc-970424 17500 +libc-970425 17500 +libc-970426 17500 +libc-970427 17500 +libc-970428 17500 +libc-970429 17500 +libc-970430 17500 +libc-970501 17500 +libc-970502 17500 +libc-970503 17500 +libc-970504 17500 +libc-970505 17500 +libc-970506 17675 +libc-970507 17675 +libc-970508 17693 +libc-970509 17693 +libc-970510 17693 +libc-970511 17693 +libc-970512 17693 +libc-970513 17693 +libc-970514 17693 +libc-970515 17693 +libc-970516 17693 +libc-970517 17693 +libc-970518 17693 +libc-970519 17693 +libc-970520 17693 +libc-970521 17693 +libc-970522 17693 +libc-970523 17693 +libc-970524 17693 +libc-970525 17693 +libc-970526 17693 +libc-970527 17693 +libc-970528 17693 +libc-970529 17693 +libc-970530 17693 +libc-970531 17693 +libc-970601 17693 +libc-970602 17693 +libc-970603 17693 +libc-970604 17693 +libc-970605 17693 +libc-970606 18148 +libc-970607 18148 +libc-970608 18164 +libc-970609 18174 +libc-970610 18209 +libc-970611 18209 +libc-970612 18209 +libc-970613 18209 +libc-970614 18209 +libc-970615 18209 +libc-970616 18209 +libc-970617 18209 +libc-970618 18209 +libc-970619 18209 +libc-970620 18209 +libc-970621 18209 +libc-970622 18209 +libc-970624 18421 +libc-970625 18421 +libc-970626 18421 +libc-970627 18421 +libc-970628 18473 +libc-970629 18473 +libc-970630 18473 +libc-970701 18473 +libc-970702 18473 +libc-970703 18473 +libc-970704 18473 +libc-970705 18473 +libc-970707 18663 +libc-970708 18663 +libc-970709 18663 +libc-970710 18663 +libc-970713 18663 +libc-970715 18780 +libc-970717 18824 +libc-970718 18824 +libc-970719 18824 +libc-970720 18824 +libc-970721 18889 +libc-970722 18889 +libc-970723 18889 +libc-970724 18889 +libc-970725 18889 +libc-970726 18889 +libc-970727 19000 +libc-970728 19000 +libc-970729 19030 +libc-970730 19030 +libc-970731 19030 +libc-970801 19030 +libc-970802 19074 +libc-970803 19074 +libc-970804 19074 +libc-970805 19074 +libc-970806 19074 +libc-970807 19074 +libc-970808 19074 +libc-970809 19074 +libc-970810 19074 +libc-970811 19074 +libc-970812 19074 +libc-970813 19074 +libc-970814 19074 +libc-970815 19074 +libc-970816 19074 +libc-970817 19074 +libc-970818 19074 +libc-970819 19074 +libc-970820 19074 +libc-970821 19074 +libc-970822 19074 +libc-970823 19472 +libc-970824 19472 +libc-970825 19472 +libc-970826 19472 +libc-970827 19541 +libc-970828 19541 +libc-970829 19541 +libc-970830 19541 +libc-970831 19541 +libc-970901 19541 +libc-970902 19541 +libc-970903 19541 +libc-970904 19541 +libc-970905 19541 +libc-970906 19766 +libc-970907 19766 +libc-970908 19766 +libc-970911 19861 +libc-970912 19861 +libc-970913 19861 +libc-970914 19861 +libc-970915 19861 +libc-970916 19861 +libc-970917 19861 +libc-970918 19861 +libc-970919 19861 +libc-970920 19861 +libc-970921 19861 +libc-970922 19861 +libc-970923 19861 +libc-970924 19861 +libc-970925 19861 +libc-970926 19861 +libc-970927 19861 +libc-970928 19861 +libc-970929 19861 +libc-970930 19861 +libc-971001 19861 +libc-971018 19861 +libc-971019 19861 +libc-971020 19861 +libc-971021 19861 +libc-971022 19861 +libc-971023 19861 +libc-971024 19861 +libc-971025 19861 +libc-971026 19861 +libc-971027 19861 +libc-971028 19861 +libc-971029 19861 +libc-971030 19861 +libc-971031 19861 +libc-971101 19861 +libc-971102 19861 +libc-971103 19861 +libc-971104 19861 +libc-971105 19861 +libc-971106 19861 +libc-971107 19861 +libc-971108 19861 +libc-971109 19861 +libc-971110 19861 +libc-971111 19861 +libc-971112 19861 +libc-971113 19861 +libc-971114 19861 +libc-971115 19861 +libc-971116 19861 +libc-971117 19861 +libc-971118 19861 +libc-971120 19861 +libc-971121 19861 +libc-971122 19861 +libc-971123 19861 +libc-971124 19861 +libc-971125 19861 +libc-971126 19861 +libc-971127 19861 +libc-971128 19861 +libc-971129 19861 +libc-971130 19861 +libc-971201 19861 +libc-971203 19861 +libc-971204 19861 +libc-971205 19861 +libc-971206 19861 +libc-971207 19861 +libc-971208 19861 +libc-971209 19861 +libc-971210 19861 +libc-971211 19861 +libc-971212 19861 +libc-971213 19861 +libc-971214 19861 +libc-971217 19861 +libc-971218 19861 +libc-971219 19861 +libc-971220 19861 +libc-971221 19861 +libc-971222 19861 +libc-971223 19861 +libc-971224 19861 +libc-971225 19861 +libc-971226 19861 +libc-971227 19861 +libc-971228 19861 +libc-971229 19861 +libc-971230 19861 +libc-971231 19861 +libc-980103 19861 +libc-980104 19861 +libc-980105 19861 +libc-980106 19861 +libc-980107 19861 +libc-980108 19861 +libc-980109 19861 +libc-980110 19861 +libc-980111 19861 +libc-980112 19861 +libc-980114 19861 +libc-980115 19861 +libc-980116 19861 +libc-980117 19861 +libc-980118 19861 +libc-980119 19861 +libc-980120 19861 +libc-980121 19861 +libc-980122 19861 +libc-980123 19861 +libc-980124 19861 +libc-980125 19861 +libc-980126 19861 +libc-980127 19861 +libc-980128 19861 +libc-980129 20797 +libc-980130 20797 +libc-980212 20832 +libc-980213 20832 +libc-980214 20893 +libc-980215 20893 +libc-980216 20893 +libc-980217 20893 +libc-980218 20893 +libc-980219 20893 +libc-980220 20893 +libc-980221 20893 +libc-980222 20893 +libc-980223 20893 +libc-980224 20893 +libc-980225 20893 +libc-980226 20893 +libc-980227 20893 +libc-980228 20893 +libc-980301 20893 +libc-980302 20893 +libc-980303 20893 +libc-980304 20893 +libc-980306 20893 +libc-980307 20893 +libc-980308 20893 +libc-980309 20893 +libc-980310 20893 +libc-980311 20893 +libc-980312 20893 +libc-980313 20893 +libc-980314 20893 +libc-980315 20893 +libc-980316 20893 +libc-980317 20893 +libc-980318 20893 +libc-980319 20893 +libc-980320 20893 +libc-980321 20893 +libc-980322 20893 +libc-980323 20893 +libc-980324 20893 +libc-980325 20893 +libc-980326 20893 +libc-980327 20893 +libc-980328 20893 +libc-980329 20893 +libc-980330 20893 +libc-980331 20893 +libc-980401 20893 +libc-980402 20893 +libc-980403 20893 +libc-980404 20893 +libc-980405 20893 +libc-980406 20893 +libc-980407 20893 +libc-980408 20893 +libc-980409 20893 +libc-980410 20893 +libc-980411 20893 +libc-980412 20893 +libc-980413 20893 +libc-980414 20893 +libc-980428 20893 +libc-980429 20893 +libc-980430 20893 +libc-980501 20893 +libc-980502 20893 +libc-980503 20893 +libc-980504 20893 +libc-980505 20893 +libc-980506 20893 +libc-980507 20893 +libc-980508 20893 +libc-980509 20893 +libc-980510 20893 +libc-980512 20893 +libc-980513 20893 +libc-980514 20893 +libc-980515 20893 +libc-980516 20893 +libc-980517 20893 +libc-980518 20893 +libc-980519 20893 +libc-980520 20893 +libc-980521 20893 +libc-980522 20893 +libc-980523 20893 +libc-980524 20893 +libc-980525 20893 +libc-980526 20893 +libc-980527 20893 +libc-980528 20893 +libc-980529 20893 +libc-980530 20893 +libc-980531 20893 +libc-980601 20893 +libc-980602 20893 +libc-980603 20893 +libc-980604 20893 +libc-980605 20893 +libc-980606 20893 +libc-980607 20893 +libc-980608 20893 +libc-980609 20893 +libc-980610 20893 +libc-980611 20893 +libc-980612 20893 +libc-980613 20893 +libc-980614 22478 +libc-980615 22478 +libc-980616 22478 +libc-980617 22478 +libc-980618 22478 +libc-980619 22478 +libc-980620 22478 +libc-980621 22478 +libc-980622 22478 +libc-980623 22478 +libc-980624 22478 +libc-980625 22478 +libc-980626 22478 +libc-980627 22478 +libc-980628 22478 +libc-980629 22478 +libc-980630 22478 +libc-980701 22478 +libc-980702 22478 +libc-980703 22478 +libc-980704 22478 +libc-980705 22478 +libc-980706 22478 +libc-980707 22478 +libc-980708 22478 +libc-980709 22478 +libc-980710 22478 +libc-980711 22478 +libc-980712 22478 +libc-980713 22478 +libc-980714 22478 +libc-980715 22478 +libc-980716 22478 +libc-980717 22478 +libc-980718 22478 +libc-980719 22478 +libc-980720 22787 +libc_1_09 10803 +make-3-72-9 10364 +make-3-72-10 10364 +make-3-72-11 10364 +make-3-72-12 10364 +make-3-72-13 10364 +make-3-73 10364 +make-3-73-1 10364 +make-3-73-2 10364 +make-3-73-3 11789 +make-3-74 11789 +make-3-74-1 12800 +make-3-74-2 12800 +make-3-74-3 14458 +make-3-74-4 14846 +make-3-74-5 15594 +make-3-74-6 15594 +make-3-74-7 15594 +make-3-75 15594 +make-3-75-1 18912 +make-3-75-91 18912 +make-3-75-92 19342 +make-3-75-93 21502 +make-3-76 19768 +make-3-76-1 19768 +release-0-0 15702 +release-0-1 15702 +release-1-0 17404 +Release_5_25 24283 +root-libc-2_0_x-branch 16843 ------------------------------------------------------------ revno: 107746 committer: Michael Albinus branch nick: trunk timestamp: Tue 2012-04-03 15:44:41 +0200 message: Change doc flag for D-Bus diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-04-03 10:16:54 +0000 +++ etc/NEWS 2012-04-03 13:44:41 +0000 @@ -653,17 +653,21 @@ ** D-Bus ++++ *** It is now possible to access buses other than the default system or session bus. ++++ *** The `dbus-register-method' and `dbus-register-property' functions optionally do not register names. ++++ *** The new function `dbus-register-service' registers a known service name on a D-Bus without simultaneously registering a property or a method. ** Dired-x + --- *** C-x C-j (`dired-jump') and C-x 4 C-j (`dired-jump-other-window'), if called with a prefix argument, read a file name from the minibuffer ------------------------------------------------------------ revno: 107745 committer: Bastien Guerry branch nick: trunk timestamp: Tue 2012-04-03 14:02:21 +0200 message: Add :version tag to new Org options in Emacs 24.1 diff: === modified file 'lisp/org/ob-exp.el' --- lisp/org/ob-exp.el 2012-04-01 20:27:06 +0000 +++ lisp/org/ob-exp.el 2012-04-03 12:02:21 +0000 @@ -43,6 +43,7 @@ When set to nil no code will be evaluated as part of the export process." :group 'org-babel + :version "24.1" :type 'boolean) (put 'org-export-babel-evaluate 'safe-local-variable (lambda (x) (eq x nil))) === modified file 'lisp/org/ob-js.el' --- lisp/org/ob-js.el 2012-04-01 20:27:06 +0000 +++ lisp/org/ob-js.el 2012-04-03 12:02:21 +0000 @@ -55,6 +55,7 @@ (defcustom org-babel-js-cmd "node" "Name of command used to evaluate js blocks." :group 'org-babel + :version "24.1" :type 'string) (defvar org-babel-js-function-wrapper === modified file 'lisp/org/ob-lisp.el' --- lisp/org/ob-lisp.el 2012-04-01 20:27:06 +0000 +++ lisp/org/ob-lisp.el 2012-04-03 12:02:21 +0000 @@ -49,6 +49,7 @@ For example a value of \"(progn ;; %s\\n %%s)\" would ignore the current directory string." :group 'org-babel + :version "24.1" :type 'string) (defun org-babel-expand-body:lisp (body params) === modified file 'lisp/org/ob-lob.el' --- lisp/org/ob-lob.el 2012-04-01 20:27:06 +0000 +++ lisp/org/ob-lob.el 2012-04-03 12:02:21 +0000 @@ -39,6 +39,7 @@ "Files used to populate the `org-babel-library-of-babel'. To add files to this list use the `org-babel-lob-ingest' command." :group 'org-babel + :version "24.1" :type 'list) (defvar org-babel-default-lob-header-args '((:exports . "results")) === modified file 'lisp/org/ob-picolisp.el' --- lisp/org/ob-picolisp.el 2012-04-01 20:27:06 +0000 +++ lisp/org/ob-picolisp.el 2012-04-03 12:02:21 +0000 @@ -76,6 +76,7 @@ (defcustom org-babel-picolisp-cmd "pil" "Name of command used to evaluate picolisp blocks." :group 'org-babel + :version "24.1" :type 'string) (defun org-babel-expand-body:picolisp (body params &optional processed-params) === modified file 'lisp/org/ob-plantuml.el' --- lisp/org/ob-plantuml.el 2012-01-04 14:49:41 +0000 +++ lisp/org/ob-plantuml.el 2012-04-03 12:02:21 +0000 @@ -44,6 +44,7 @@ (defcustom org-plantuml-jar-path nil "Path to the plantuml.jar file." :group 'org-babel + :version "24.1" :type 'string) (defun org-babel-execute:plantuml (body params) === modified file 'lisp/org/ob-scheme.el' --- lisp/org/ob-scheme.el 2012-04-01 20:27:06 +0000 +++ lisp/org/ob-scheme.el 2012-04-03 12:02:21 +0000 @@ -54,6 +54,7 @@ (defcustom org-babel-scheme-cmd "guile" "Name of command used to evaluate scheme blocks." :group 'org-babel + :version "24.1" :type 'string) (defun org-babel-expand-body:scheme (body params) === modified file 'lisp/org/ob-tangle.el' --- lisp/org/ob-tangle.el 2012-04-01 09:49:25 +0000 +++ lisp/org/ob-tangle.el 2012-04-03 12:02:21 +0000 @@ -47,6 +47,7 @@ written in this language. If no entry is found in this list, then the name of the language is used." :group 'org-babel-tangle + :version "24.1" :type '(repeat (cons (string "Language name") @@ -55,16 +56,19 @@ (defcustom org-babel-post-tangle-hook nil "Hook run in code files tangled by `org-babel-tangle'." :group 'org-babel + :version "24.1" :type 'hook) (defcustom org-babel-pre-tangle-hook '(save-buffer) "Hook run at the beginning of `org-babel-tangle'." :group 'org-babel + :version "24.1" :type 'hook) (defcustom org-babel-tangle-body-hook nil "Hook run over the contents of each code block body." :group 'org-babel + :version "24.1" :type 'hook) (defcustom org-babel-tangle-comment-format-beg "[[%link][%source-name]]" @@ -79,6 +83,7 @@ Whether or not comments are inserted during tangling is controlled by the :comments header argument." :group 'org-babel + :version "24.1" :type 'string) (defcustom org-babel-tangle-comment-format-end "%source-name ends here" @@ -93,6 +98,7 @@ Whether or not comments are inserted during tangling is controlled by the :comments header argument." :group 'org-babel + :version "24.1" :type 'string) (defcustom org-babel-process-comment-text #'org-babel-trim @@ -101,6 +107,7 @@ should take a single string argument and return a string result. The default value is `org-babel-trim'." :group 'org-babel + :version "24.1" :type 'function) (defun org-babel-find-file-noselect-refresh (file) === modified file 'lisp/org/ob.el' --- lisp/org/ob.el 2012-04-01 20:27:06 +0000 +++ lisp/org/ob.el 2012-04-03 12:02:21 +0000 @@ -105,6 +105,7 @@ `org-babel-no-eval-on-ctrl-c-ctrl-c' variable can be used to remove code block execution from the C-c C-c keybinding." :group 'org-babel + :version "24.1" :type '(choice boolean function)) ;; don't allow this variable to be changed through file settings (put 'org-confirm-babel-evaluate 'safe-local-variable (lambda (x) (eq x t))) @@ -112,6 +113,7 @@ (defcustom org-babel-no-eval-on-ctrl-c-ctrl-c nil "Remove code block evaluation from the C-c C-c key binding." :group 'org-babel + :version "24.1" :type 'boolean) (defcustom org-babel-results-keyword "RESULTS" === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2012-04-02 15:42:03 +0000 +++ lisp/org/org-agenda.el 2012-04-03 12:02:21 +0000 @@ -649,6 +649,7 @@ to make his option also apply to the tags-todo list." :group 'org-agenda-skip :group 'org-agenda-todo-list + :version "24.1" :type '(choice (const :tag "Ignore future timestamp todos" future) (const :tag "Ignore past or present timestamp todos" past) @@ -796,6 +797,7 @@ because you will take care of it on the day when scheduled." :group 'org-agenda-skip :group 'org-agenda-daily/weekly + :version "24.1" :type '(choice (const :tag "Alwas show prewarning" nil) (const :tag "Remove prewarning if entry is scheduled" t) @@ -860,6 +862,7 @@ Setting it to nil is good if matcher strings are very long and/or if you want to use two-column display (see `org-agenda-menu-two-column')." :group 'org-agenda + :version "24.1" :type 'boolean) (defcustom org-agenda-menu-two-column nil @@ -867,6 +870,7 @@ If you use this, you probably want to set `org-agenda-menu-show-matcher' to nil." :group 'org-agenda + :version "24.1" :type 'boolean) (defcustom org-finalize-agenda-hook nil @@ -890,6 +894,7 @@ "Non-nil means `org-agenda-follow-mode' displays only the current item's tree, in an indirect buffer." :group 'org-agenda + :version "24.1" :type 'boolean) (defcustom org-agenda-show-outline-path t @@ -1042,11 +1047,13 @@ "Non-nil means use leading zero for military times in agenda. For example, 9:30am would become 09:30 rather than 9:30." :group 'org-agenda-daily/weekly + :version "24.1" :type 'boolean) (defcustom org-agenda-timegrid-use-ampm nil "When set, show AM/PM style timestamps on the timegrid." :group 'org-agenda + :version "24.1" :type 'boolean) (defun org-agenda-time-of-day-to-ampm (time) @@ -1094,6 +1101,7 @@ to today. WHen nil, just move one day forward even if the date stays in the past." :group 'org-agenda-daily/weekly + :version "24.1" :type 'boolean) (defcustom org-agenda-include-diary nil @@ -1106,6 +1114,7 @@ "If non-nil, include entries within their deadline warning period. Custom commands can set this variable in the options section." :group 'org-agenda-daily/weekly + :version "24.1" :type 'boolean) (defcustom org-agenda-repeating-timestamp-show-all t @@ -1181,6 +1190,7 @@ :short-face face for clock intervals that are too short" :group 'org-agenda-daily/weekly :group 'org-clock + :version "24.1" :type 'plist) (defcustom org-agenda-log-mode-add-notes t @@ -1239,6 +1249,7 @@ is a regexp marked with braces like \"{abc}\", this will also switch to boolean search." :group 'org-agenda-search-view + :version "24.1" :type 'boolean) (if (fboundp 'defvaralias) @@ -1249,6 +1260,7 @@ "Non-nil means, search words must be matches as complete words. When nil, they may also match part of a word." :group 'org-agenda-search-view + :version "24.1" :type 'boolean) (defgroup org-agenda-time-grid nil @@ -1312,12 +1324,14 @@ (defcustom org-agenda-show-current-time-in-grid t "Non-nil means show the current time in the time grid." :group 'org-agenda-time-grid + :version "24.1" :type 'boolean) (defcustom org-agenda-current-time-string "now - - - - - - - - - - - - - - - - - - - - - - - - -" "The string for the current time marker in the agenda." :group 'org-agenda-time-grid + :version "24.1" :type 'string) (defgroup org-agenda-sorting nil @@ -1528,6 +1542,7 @@ "Text preceding item pulled into the agenda by inactive time stamps. These entries are added to the agenda when pressing \"[\"." :group 'org-agenda-line-format + :version "24.1" :type '(list (string :tag "Scheduled today ") (string :tag "Scheduled previously"))) @@ -1566,6 +1581,7 @@ "Non-nil means remove time ranges specifications in agenda items that span on several days." :group 'org-agenda-line-format + :version "24.1" :type 'boolean) (defcustom org-agenda-default-appointment-duration nil @@ -1647,6 +1663,7 @@ returns a face, or nil if does not want to specify a face and let the normal rules apply." :group 'org-agenda-line-format + :version "24.1" :type 'function) (defcustom org-agenda-category-icon-alist nil @@ -1679,6 +1696,7 @@ (\"Emacs\" '(space . (:width (16))))" :group 'org-agenda-line-format + :version "24.1" :type '(alist :key-type (string :tag "Regexp matching category") :value-type (choice (list :tag "Icon" (string :tag "File or data") @@ -1741,6 +1759,7 @@ the custom function `set-category' on the selected entries. Note that functions in this alist don't need to be quoted." :type 'alist + :version "24.1" :group 'org-agenda) (eval-when-compile @@ -7998,6 +8017,7 @@ (defcustom org-agenda-insert-diary-extract-time nil "Non-nil means extract any time specification from the diary entry." :group 'org-agenda + :version "24.1" :type 'boolean) (defun org-agenda-add-entry-to-org-agenda-diary-file (type text &optional d1 d2) === modified file 'lisp/org/org-archive.el' --- lisp/org/org-archive.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-archive.el 2012-04-03 12:02:21 +0000 @@ -43,6 +43,7 @@ (defcustom org-archive-reversed-order nil "Non-nil means make the tree first child under the archive heading, not last." :group 'org-archive + :version "24.1" :type 'boolean) (defcustom org-archive-sibling-heading "Archive" @@ -72,6 +73,7 @@ (defcustom org-archive-subtree-add-inherited-tags 'infile "Non-nil means append inherited tags when archiving a subtree." :group 'org-archive + :version "24.1" :type '(choice (const :tag "Never" nil) (const :tag "When archiving a subtree to the same file" infile) === modified file 'lisp/org/org-attach.el' --- lisp/org/org-attach.el 2012-04-01 20:27:06 +0000 +++ lisp/org/org-attach.el 2012-04-03 12:02:21 +0000 @@ -101,6 +101,7 @@ (defcustom org-attach-store-link-p nil "Non-nil means store a link to a file when attaching it." :group 'org-attach + :version "24.1" :type '(choice (const :tag "Don't store link" nil) (const :tag "Link to origin location" t) === modified file 'lisp/org/org-beamer.el' --- lisp/org/org-beamer.el 2012-04-01 20:27:06 +0000 +++ lisp/org/org-beamer.el 2012-04-03 12:02:21 +0000 @@ -43,6 +43,7 @@ (defcustom org-beamer-use-parts nil "" :group 'org-beamer + :version "24.1" :type 'boolean) (defcustom org-beamer-frame-level 1 @@ -52,6 +53,7 @@ You can set this to 4 as well, if you at the same time set `org-beamer-use-parts' to make the top levels `\part'." :group 'org-beamer + :version "24.1" :type '(choice (const :tag "Frames need a BEAMER_env property" nil) (integer :tag "Specific level makes a frame"))) @@ -60,12 +62,14 @@ "Default options string to use for frames, should contains the [brackets]. And example for this is \"[allowframebreaks]\"." :group 'org-beamer + :version "24.1" :type '(string :tag "[options]")) (defcustom org-beamer-column-view-format "%45ITEM %10BEAMER_env(Env) %10BEAMER_envargs(Env Args) %4BEAMER_col(Col) %8BEAMER_extra(Extra)" "Default column view format that should be used to fill the template." :group 'org-beamer + :version "24.1" :type '(choice (const :tag "Do not insert Beamer column view format" nil) (string :tag "Beamer column view format"))) @@ -76,6 +80,7 @@ When a beamer template is filled, this will be the default for BEAMER_HEADER_EXTRA, which will be inserted just before \\begin{document}." :group 'org-beamer + :version "24.1" :type '(choice (const :tag "Do not insert Beamer themes" nil) (string :tag "Beamer themes"))) @@ -142,6 +147,7 @@ close The closing string of the environment." :group 'org-beamer + :version "24.1" :type '(repeat (list (string :tag "Environment") @@ -402,6 +408,7 @@ (defcustom org-beamer-fragile-re "\\\\\\(verb\\|lstinline\\)\\|^[ \t]*\\\\begin{\\(verbatim\\|lstlisting\\|minted\\)}" "If this regexp matches in a frame, the frame is marked as fragile." :group 'org-beamer + :version "24.1" :type 'regexp) (defface org-beamer-tag '((t (:box (:line-width 1 :color grey40)))) @@ -511,6 +518,7 @@ (defcustom org-beamer-outline-frame-title "Outline" "Default title of a frame containing an outline." :group 'org-beamer + :version "24.1" :type '(string :tag "Outline frame title") ) @@ -519,6 +527,7 @@ You might want to put e.g. [allowframebreaks=0.9] here. Remember to include square brackets." :group 'org-beamer + :version "24.1" :type '(string :tag "Outline frame options") ) === modified file 'lisp/org/org-bibtex.el' --- lisp/org/org-bibtex.el 2012-04-01 20:27:06 +0000 +++ lisp/org/org-bibtex.el 2012-04-03 12:02:21 +0000 @@ -216,12 +216,14 @@ (defcustom org-bibtex-autogen-keys nil "Set to a truth value to use `bibtex-generate-autokey' to generate keys." :group 'org-bibtex + :version "24.1" :type 'boolean) (defcustom org-bibtex-prefix nil "Optional prefix for all bibtex property names. For example setting to 'BIB_' would allow interoperability with fireforg." :group 'org-bibtex + :version "24.1" :type 'string) (defcustom org-bibtex-treat-headline-as-title t @@ -230,6 +232,7 @@ the property. If this value is t, `org-bibtex-check' will ignore a missing title field." :group 'org-bibtex + :version "24.1" :type 'boolean) (defcustom org-bibtex-export-arbitrary-fields nil @@ -238,6 +241,7 @@ ensure that other org-properties, such as CATEGORY or LOGGING are not placed in the exported bibtex entry." :group 'org-bibtex + :version "24.1" :type 'boolean) (defcustom org-bibtex-key-property "CUSTOM_ID" @@ -247,11 +251,13 @@ to enable global links, but only with great caution, as global IDs must be unique." :group 'org-bibtex + :version "24.1" :type 'string) (defcustom org-bibtex-tags nil "List of tag(s) that should be added to new bib entries." :group 'org-bibtex + :version "24.1" :type '(repeat :tag "Tag" (string))) (defcustom org-bibtex-tags-are-keywords nil @@ -266,17 +272,20 @@ defined in `org-bibtex-tags' or `org-bibtex-no-export-tags' will not be exported." :group 'org-bibtex + :version "24.1" :type 'boolean) (defcustom org-bibtex-no-export-tags nil "List of tag(s) that should not be converted to keywords. This variable is relevant only if `org-bibtex-export-tags-as-keywords` is t." :group 'org-bibtex + :version "24.1" :type '(repeat :tag "Tag" (string))) (defcustom org-bibtex-type-property-name "btype" "Property in which to store bibtex entry type (e.g., article)." :group 'org-bibtex + :version "24.1" :type 'string) === modified file 'lisp/org/org-capture.el' --- lisp/org/org-capture.el 2012-04-01 20:27:06 +0000 +++ lisp/org/org-capture.el 2012-04-03 12:02:21 +0000 @@ -262,6 +262,7 @@ info | %:type %:file %:node calendar | %:type %:date" :group 'org-capture + :version "24.1" :type '(repeat (choice :value ("" "" entry (file "~/org/notes.org") "") @@ -336,12 +337,14 @@ The capture buffer is still current when this hook runs and it is widened to the entire buffer." :group 'org-capture + :version "24.1" :type 'hook) (defcustom org-capture-after-finalize-hook nil "Hook that is run right after a capture process is finalized. Suitable for window cleanup" :group 'org-capture + :version "24.1" :type 'hook) ;;; The property list for keeping information about the capture process === modified file 'lisp/org/org-clock.el' --- lisp/org/org-clock.el 2012-04-02 15:42:03 +0000 +++ lisp/org/org-clock.el 2012-04-03 12:02:21 +0000 @@ -226,6 +226,7 @@ When this is a string, it is prepended to the clock string as an indication, also using the face `org-mode-line-clock-overrun'." :group 'org-clock + :version "24.1" :type '(choice (const :tag "Just mark the time string" nil) (string :tag "Text to prepend"))) @@ -267,12 +268,14 @@ :formatter nil) "Default properties for clock tables." :group 'org-clock + :version "24.1" :type 'plist) (defcustom org-clock-clocktable-formatter 'org-clocktable-write-default "Function to turn clocking data into a table. For more information, see `org-clocktable-write-default'." :group 'org-clocktable + :version "24.1" :type 'function) ;; FIXME: translate es and nl last string "Clock summary at" @@ -283,6 +286,7 @@ ("nl" "Bestand" "N" "Tijdstip" "Hoofding" "Duur" "ALLES" "Totale duur" "Bestandstijd" "Clock summary at")) "Terms used in clocktable, translated to different languages." :group 'org-clocktable + :version "24.1" :type 'alist) (defcustom org-clock-clocktable-default-properties '(:maxlevel 2 :scope file) @@ -310,11 +314,13 @@ (defcustom org-clock-report-include-clocking-task nil "When non-nil, include the current clocking task time in clock reports." :group 'org-clock + :version "24.1" :type 'boolean) (defcustom org-clock-resolve-expert nil "Non-nil means do not show the splash buffer with the clock resolver." :group 'org-clock + :version "24.1" :type 'boolean) (defvar org-clock-in-prepare-hook nil === modified file 'lisp/org/org-ctags.el' --- lisp/org/org-ctags.el 2012-01-10 06:20:22 +0000 +++ lisp/org/org-ctags.el 2012-04-03 12:02:21 +0000 @@ -162,6 +162,7 @@ (t "ctags-exuberant")) "Full path to the ctags executable file." :group 'org-ctags + :version "24.1" :type 'file) (defcustom org-ctags-open-link-functions @@ -170,6 +171,7 @@ org-ctags-ask-append-topic) "List of functions to be prepended to ORG-OPEN-LINK-FUNCTIONS when ORG-CTAGS is active." :group 'org-ctags + :version "24.1" :type 'hook :options '(org-ctags-find-tag org-ctags-ask-rebuild-tags-file-then-find-tag === modified file 'lisp/org/org-docbook.el' --- lisp/org/org-docbook.el 2012-04-01 20:27:06 +0000 +++ lisp/org/org-docbook.el 2012-04-03 12:02:21 +0000 @@ -150,6 +150,7 @@ (defcustom org-export-docbook-footnote-separator ", " "Text used to separate footnotes." :group 'org-export-docbook + :version "24.1" :type 'string) (defcustom org-export-docbook-emphasis-alist @@ -195,6 +196,7 @@ Object (FO) files. You can use either `fo/docbook.xsl' that comes with DocBook, or any customization layer you may have." :group 'org-export-docbook + :version "24.1" :type 'string) (defcustom org-export-docbook-xslt-proc-command nil === modified file 'lisp/org/org-entities.el' --- lisp/org/org-entities.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-entities.el 2012-04-03 12:02:21 +0000 @@ -44,6 +44,7 @@ For example, this will replace \"\\nsup\" with \"[not a superset of]\" in backends where the corresponding character is not available." :group 'org-entities + :version "24.1" :type 'boolean) (defcustom org-entities-user nil @@ -68,6 +69,7 @@ If you define new entities here that require specific LaTeX packages to be loaded, add these packages to `org-export-latex-packages-alist'." :group 'org-entities + :version "24.1" :type '(repeat (list (string :tag "name ") === modified file 'lisp/org/org-exp-blocks.el' --- lisp/org/org-exp-blocks.el 2012-04-01 09:49:25 +0000 +++ lisp/org/org-exp-blocks.el 2012-04-03 12:02:21 +0000 @@ -136,6 +136,7 @@ (defcustom org-export-blocks-postblock-hook nil "Run after blocks have been processed with `org-export-blocks-preprocess'." :group 'org-export-general + :version "24.1" :type 'hook) (defun org-export-blocks-html-quote (body &optional open close) === modified file 'lisp/org/org-exp.el' --- lisp/org/org-exp.el 2012-04-01 09:49:25 +0000 +++ lisp/org/org-exp.el 2012-04-03 12:02:21 +0000 @@ -98,6 +98,7 @@ This applied to the commands `org-export-as-html-and-open' and `org-export-as-pdf-and-open'." :group 'org-export-general + :version "24.1" :type 'boolean) (defcustom org-export-run-in-background nil @@ -120,6 +121,7 @@ "The initial scope when exporting with `org-export'. This variable can be either set to 'buffer or 'subtree." :group 'org-export-general + :version "24.1" :type '(choice (const :tag "Export current buffer" 'buffer) (const :tag "Export current subtree" 'subtree))) @@ -220,6 +222,7 @@ (defcustom org-export-date-timestamp-format "%Y-%m-%d" "Time string format for Org timestamps in the #+DATE option." :group 'org-export-general + :version "24.1" :type 'string) (defvar org-export-page-description "" @@ -317,6 +320,7 @@ nil remove all tasks before export list of TODO kwds keep only tasks with these keywords" :group 'org-export-general + :version "24.1" :type '(choice (const :tag "All tasks" t) (const :tag "No tasks" nil) @@ -367,6 +371,7 @@ This option can also be set with the +OPTIONS line, e.g. \"email:t\"." :group 'org-export-general + :version "24.1" :type 'boolean) (defcustom org-export-creator-info t @@ -594,6 +599,7 @@ This is the global equivalent of the :remove-nil-lines option when locally sending a table with #+ORGTBL." :group 'org-export-tables + :version "24.1" :type 'boolean) (defcustom org-export-prefer-native-exporter-for-tables nil === modified file 'lisp/org/org-faces.el' --- lisp/org/org-faces.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-faces.el 2012-04-03 12:02:21 +0000 @@ -351,6 +351,7 @@ color." :group 'org-faces :group 'org-todo + :version "24.1" :type '(repeat (cons (choice (const todo) (const tag) (const priority)) (choice (const :foreground) (const :background))))) @@ -547,6 +548,7 @@ When nil, format these as normal Org. This is the default, because the content of these blocks will still be treated as Org syntax." :group 'org-faces + :version "24.1" :type 'boolean) (defface org-clock-overlay ;; copied from secondary-selection @@ -732,6 +734,7 @@ level org-n-level-faces" :group 'org-appearance :group 'org-faces + :version "24.1" :type 'boolean) (defface org-latex-and-export-specials === modified file 'lisp/org/org-freemind.el' --- lisp/org/org-freemind.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-freemind.el 2012-04-03 12:02:21 +0000 @@ -414,6 +414,7 @@ ;; with this setting now, but not before??? Was this perhaps a java ;; bug or is it a windows xp bug (some resource gets exhausted if you ;; use sticky keys which I do). + :version "24.1" :group 'org-freemind) (defun org-freemind-org-text-to-freemind-subnode/note (node-name start end drawers-regexp) === modified file 'lisp/org/org-gnus.el' --- lisp/org/org-gnus.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-gnus.el 2012-04-03 12:02:21 +0000 @@ -62,6 +62,7 @@ So if following a link to a Gnus article takes ages, try setting this variable to `t'." :group 'org-link-store + :version "24.1" :type 'boolean) === modified file 'lisp/org/org-habit.el' --- lisp/org/org-habit.el 2012-04-01 09:49:25 +0000 +++ lisp/org/org-habit.el 2012-04-03 12:02:21 +0000 @@ -70,11 +70,13 @@ (defcustom org-habit-today-glyph ?! "Glyph character used to identify today." :group 'org-habit + :version "24.1" :type 'character) (defcustom org-habit-completed-glyph ?* "Glyph character used to show completed days on which a task was done." :group 'org-habit + :version "24.1" :type 'character) (defface org-habit-clear-face === modified file 'lisp/org/org-html.el' --- lisp/org/org-html.el 2012-04-01 09:49:25 +0000 +++ lisp/org/org-html.el 2012-04-03 12:02:21 +0000 @@ -64,6 +64,7 @@ (defcustom org-export-html-footnote-separator ", " "Text used to separate footnotes." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-coding-system nil @@ -252,6 +253,7 @@ #+MATHJAX: scale:\"133\" align:\"right\" mathml:t path:\"/MathJax/\"" :group 'org-export-html + :version "24.1" :type '(list :greedy t (list :tag "path (the path from where to load MathJax.js)" (const :format " " path) (string)) @@ -335,6 +337,7 @@ " "The MathJax setup for XHTML files." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-tag-class-prefix "" @@ -361,6 +364,7 @@ to the headline (e.g. \"sec-2\"). When set to `nil', don't insert HTML anchors in headlines." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-preamble t @@ -392,6 +396,7 @@ If you need to use a \"%\" character, you need to escape it like that: \"%%\"." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-postamble 'auto @@ -432,6 +437,7 @@ If you need to use a \"%\" character, you need to escape it like that: \"%%\"." :group 'org-export-html + :version "24.1" :type 'string) (defcustom org-export-html-home/up-format @@ -548,6 +554,7 @@ is ignored by some browsers (like Firefox, Safari). Opera does it right though." :group 'org-export-tables + :version "24.1" :type 'boolean) (defcustom org-export-html-table-use-header-tags-for-first-column nil @@ -578,6 +585,7 @@ (">" . ">")) "Alist of characters to be converted by `org-html-protect'." :group 'org-export-html + :version "24.1" :type '(repeat (cons (string :tag "Character") (string :tag "HTML equivalent")))) @@ -639,6 +647,7 @@ DIV, the second one for the content DIV and the third one for the postamble DIV." :group 'org-export-html + :version "24.1" :type '(list (string :tag " Div for the preamble:") (string :tag " Div for the content:") === modified file 'lisp/org/org-icalendar.el' --- lisp/org/org-icalendar.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-icalendar.el 2012-04-03 12:02:21 +0000 @@ -54,6 +54,7 @@ - The alarm will go off N minutes before the event - only a DISPLAY action is defined." :group 'org-export-icalendar + :version "24.1" :type 'integer) (defcustom org-icalendar-combined-name "OrgMode" @@ -64,6 +65,7 @@ (defcustom org-icalendar-combined-description nil "Calendar description for the combined iCalendar (all agenda files)." :group 'org-export-icalendar + :version "24.1" :type 'string) (defcustom org-icalendar-use-plain-timestamp t @@ -74,6 +76,7 @@ (defcustom org-icalendar-honor-noexport-tag nil "Non-nil means don't export entries with a tag in `org-export-exclude-tags'." :group 'org-export-icalendar + :version "24.1" :type 'boolean) (defcustom org-icalendar-use-deadline '(event-if-not-todo todo-due) @@ -213,6 +216,7 @@ - \":%Y%m%dT%H%M%SZ\" for time expressed in Universal Time" :group 'org-export-icalendar + :version "24.1" :type '(choice (const :tag "Local time" ":%Y%m%dT%H%M%S") (const :tag "Explicit local time" ";TZID=%Z:%Y%m%dT%H%M%S") === modified file 'lisp/org/org-inlinetask.el' --- lisp/org/org-inlinetask.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-inlinetask.el 2012-04-03 12:02:21 +0000 @@ -173,6 +173,7 @@ This should be the state `org-inlinetask-insert-task' should use by default, or nil of no state should be assigned." :group 'org-inlinetask + :version "24.1" :type '(choice (const :tag "No state" nil) (string :tag "Specific state"))) === modified file 'lisp/org/org-list.el' --- lisp/org/org-list.el 2012-04-01 09:49:25 +0000 +++ lisp/org/org-list.el 2012-04-03 12:02:21 +0000 @@ -215,6 +215,7 @@ 26 items will fallback to standard numbering. Alphabetical counters like \"[@c]\" will be recognized." :group 'org-plain-lists + :version "24.1" :type 'boolean) (defcustom org-list-two-spaces-after-bullet-regexp nil @@ -258,6 +259,7 @@ outdenting a list whose bullet is * to column 0 will change that bullet to \"-\"." :group 'org-plain-lists + :version "24.1" :type '(alist :tag "Sets of rules" :key-type (choice @@ -277,6 +279,7 @@ \\[org-move-item-down], \\[org-next-item] and \\[org-previous-item]." :group 'org-plain-lists + :version "24.1" :type 'boolean) (defvar org-checkbox-statistics-hook nil @@ -306,6 +309,7 @@ By setting this to a small number, usually 1 or 2, one can more clearly distinguish sub-items in a list." :group 'org-plain-lists + :version "24.1" :type 'integer) (defcustom org-list-radio-list-templates === modified file 'lisp/org/org-mobile.el' --- lisp/org/org-mobile.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-mobile.el 2012-04-03 12:02:21 +0000 @@ -68,6 +68,7 @@ (defcustom org-mobile-files-exclude-regexp "" "A regexp to exclude files from `org-mobile-files'." :group 'org-mobile + :version "24.1" :type 'regexp) (defcustom org-mobile-directory "" @@ -84,6 +85,7 @@ application. Before turning this on, check of MobileOrg does already support it - at the time of this writing it did not yet." :group 'org-mobile + :version "24.1" :type 'boolean) (defcustom org-mobile-encryption-tempfile "~/orgtmpcrypt" @@ -91,6 +93,7 @@ This must be local file on your local machine (not on the WebDAV server). You might want to put this file into a directory where only you have access." :group 'org-mobile + :version "24.1" :type 'directory) (defcustom org-mobile-encryption-password "" @@ -111,6 +114,7 @@ this variable empty - Org will then ask for the password once per Emacs session." :group 'org-mobile + :version "24.1" :type '(string :tag "Password")) (defvar org-mobile-encryption-password-session nil) @@ -150,6 +154,7 @@ all the custom agendas and the default ones list a list of selection key(s) as string." :group 'org-mobile + :version "24.1" :type '(choice (const :tag "Default Agendas" default) (const :tag "Custom Agendas" custom) === modified file 'lisp/org/org-publish.el' --- lisp/org/org-publish.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-publish.el 2012-04-03 12:02:21 +0000 @@ -248,6 +248,7 @@ You can overwrite this default per project in your `org-publish-project-alist', using `:sitemap-sort-files'." :group 'org-publish + :version "24.1" :type 'symbol) (defcustom org-publish-sitemap-sort-folders 'first @@ -260,6 +261,7 @@ You can overwrite this default per project in your `org-publish-project-alist', using `:sitemap-sort-folders'." :group 'org-publish + :version "24.1" :type 'symbol) (defcustom org-publish-sitemap-sort-ignore-case nil @@ -268,12 +270,14 @@ You can overwrite this default per project in your `org-publish-project-alist', using `:sitemap-ignore-case'." :group 'org-publish + :version "24.1" :type 'boolean) (defcustom org-publish-sitemap-date-format "%Y-%m-%d" "Format for `format-time-string' which is used to print a date in the sitemap." :group 'org-publish + :version "24.1" :type 'string) (defcustom org-publish-sitemap-file-entry-format "%t" @@ -284,6 +288,7 @@ %a is the author. %d is the date formatted using `org-publish-sitemap-date-format'." :group 'org-publish + :version "24.1" :type 'string) === modified file 'lisp/org/org-src.el' --- lisp/org/org-src.el 2012-04-01 09:49:25 +0000 +++ lisp/org/org-src.el 2012-04-03 12:02:21 +0000 @@ -761,6 +761,7 @@ "If non-nil, the effect of TAB in a code block is as if it were issued in the language major mode buffer." :type 'boolean + :version "24.1" :group 'org-babel) (defun org-src-native-tab-command-maybe () === modified file 'lisp/org/org-table.el' --- lisp/org/org-table.el 2012-04-02 00:43:32 +0000 +++ lisp/org/org-table.el 2012-04-03 12:02:21 +0000 @@ -169,11 +169,13 @@ except maybe locally in a special file that has mostly tables with long fields." :group 'org-table + :version "24.1" :type 'boolean) (defcustom org-table-fix-formulas-confirm nil "Whether the user should confirm when Org fixes formulas." :group 'org-table-editing + :version "24.1" :type '(choice (const :tag "with yes-or-no" yes-or-no-p) (const :tag "with y-or-n" y-or-n-p) @@ -236,6 +238,7 @@ 'days, and the output will be a fraction of seconds, minutes or days." :group 'org-table-calculation + :version "24.1" :type '(choice (symbol :tag "Seconds" 'seconds) (symbol :tag "Minutes" 'minutes) (symbol :tag "Hours " 'hours) @@ -247,6 +250,7 @@ characters. Beware that modifying the display can prevent the field from being used in another formula." :group 'org-table-settings + :version "24.1" :type 'string) (defcustom org-table-formula-evaluate-inline t === modified file 'lisp/org/org-taskjuggler.el' --- lisp/org/org-taskjuggler.el 2012-01-10 06:20:22 +0000 +++ lisp/org/org-taskjuggler.el 2012-04-03 12:02:21 +0000 @@ -166,28 +166,33 @@ (defcustom org-export-taskjuggler-extension ".tjp" "Extension of TaskJuggler files." :group 'org-export-taskjuggler + :version "24.1" :type 'string) (defcustom org-export-taskjuggler-project-tag "taskjuggler_project" "Tag, property or todo used to find the tree containing all the tasks for the project." :group 'org-export-taskjuggler + :version "24.1" :type 'string) (defcustom org-export-taskjuggler-resource-tag "taskjuggler_resource" "Tag, property or todo used to find the tree containing all the resources for the project." :group 'org-export-taskjuggler + :version "24.1" :type 'string) (defcustom org-export-taskjuggler-target-version 2.4 "Which version of TaskJuggler the exporter is targeting." :group 'org-export-taskjuggler + :version "24.1" :type 'number) (defcustom org-export-taskjuggler-default-project-version "1.0" "Default version string for the project." :group 'org-export-taskjuggler + :version "24.1" :type 'string) (defcustom org-export-taskjuggler-default-project-duration 280 @@ -195,6 +200,7 @@ in the root node of the task tree, i.e. the tree that has been marked with `org-export-taskjuggler-project-tag'" :group 'org-export-taskjuggler + :version "24.1" :type 'integer) (defcustom org-export-taskjuggler-default-reports @@ -214,6 +220,7 @@ }") "Default reports for the project." :group 'org-export-taskjuggler + :version "24.1" :type '(repeat (string :tag "Report"))) (defcustom org-export-taskjuggler-default-global-properties @@ -230,6 +237,7 @@ The global properties are inserted after the project declaration but before any resource and task declarations." :group 'org-export-taskjuggler + :version "24.1" :type '(string :tag "Preamble")) ;;; Hooks === modified file 'lisp/org/org-timer.el' --- lisp/org/org-timer.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-timer.el 2012-04-03 12:02:21 +0000 @@ -53,6 +53,7 @@ "The default timer when a timer is set. When 0, the user is prompted for a value." :group 'org-time + :version "24.1" :type 'number) (defvar org-timer-start-hook nil === modified file 'lisp/org/org-wl.el' --- lisp/org/org-wl.el 2012-01-19 07:21:25 +0000 +++ lisp/org/org-wl.el 2012-04-03 12:02:21 +0000 @@ -46,11 +46,13 @@ (defcustom org-wl-link-remove-filter nil "Remove filter condition if message is filter folder." :group 'org-wl + :version "24.1" :type 'boolean) (defcustom org-wl-shimbun-prefer-web-links nil "If non-nil create web links for shimbun messages." :group 'org-wl + :version "24.1" :type 'boolean) (defcustom org-wl-nntp-prefer-web-links nil @@ -58,16 +60,19 @@ When folder name contains string \"gmane\" link to gmane, googlegroups otherwise." :type 'boolean + :version "24.1" :group 'org-wl) (defcustom org-wl-disable-folder-check t "Disable check for new messages when open a link." :type 'boolean + :version "24.1" :group 'org-wl) (defcustom org-wl-namazu-default-index nil "Default namazu search index." :type 'directory + :version "24.1" :group 'org-wl) ;; Declare external functions and variables === modified file 'lisp/org/org.el' --- lisp/org/org.el 2012-04-03 10:28:31 +0000 +++ lisp/org/org.el 2012-04-03 12:02:21 +0000 @@ -6,7 +6,7 @@ ;; Maintainer: Bastien Guerry ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 7.8.07 +;; Version: 7.8.08 ;; ;; This file is part of GNU Emacs. ;; @@ -152,6 +152,7 @@ requirements) is loaded." :group 'org-babel :set 'org-babel-do-load-languages + :version "24.1" :type '(alist :tag "Babel Languages" :key-type (choice @@ -200,11 +201,12 @@ Otherwise they inherit the ID property with a new unique identifier." :type 'boolean + :version "24.1" :group 'org-id) ;;; Version -(defconst org-version "7.8.07" +(defconst org-version "7.8.08" "The version number of the file org.el.") ;;;###autoload @@ -259,6 +261,7 @@ (defcustom org-log-buffer-setup-hook nil "Hook that is run after an Org log buffer is created." :group 'org + :version "24.1" :type 'hook) (defvar org-modules) ; defined below @@ -428,6 +431,7 @@ (const :tag "All headlines in active region" t) (const :tag "In active region, headlines at the same level than the first one" 'start-level) (string :tag "Tags/Property/Todo matcher")) + :version "24.1" :group 'org-todo :group 'org-archive) @@ -496,6 +500,7 @@ This option can also be set with the +OPTIONS line, e.g. \"^:nil\"." :group 'org-startup :group 'org-export-translation + :version "24.1" :type '(choice (const :tag "Always interpret" t) (const :tag "Only with braces" {}) @@ -512,6 +517,7 @@ #+STARTUP: beamer" :group 'org-startup + :version "24.1" :type 'boolean) (defcustom org-startup-align-all-tables nil @@ -532,6 +538,7 @@ #+STARTUP: inlineimages #+STARTUP: noinlineimages" :group 'org-startup + :version "24.1" :type 'boolean) (defcustom org-insert-mode-line-in-empty-file nil @@ -1069,6 +1076,7 @@ Any other non-nil value will result in a query to the user, if it is OK to kill that hidden subtree. When nil, kill without remorse." :group 'org-edit-structure + :version "24.1" :type '(choice (const :tag "Do not protect hidden subtrees" nil) (const :tag "Protect hidden subtrees with a security query" t) @@ -1089,6 +1097,7 @@ allows insertion and backward-delete right before ellipses. FIXME: maybe in this case we should not even show?" :group 'org-edit-structure + :version "24.1" :type '(choice (const :tag "Do not check" nil) (const :tag "Throw error when trying to edit" error) @@ -1542,6 +1551,7 @@ When nil, the link search tries to match a phrase with all words in the search text." :group 'org-link-follow + :version "24.1" :type '(choice (const :tag "Use fuzzy text search" nil) (const :tag "Match only exact headline" t) @@ -1661,6 +1671,7 @@ (defcustom org-confirm-shell-link-not-regexp "" "A regexp to skip confirmation for shell links." :group 'org-link-follow + :version "24.1" :type 'regexp) (defcustom org-confirm-elisp-link-function 'yes-or-no-p @@ -1686,6 +1697,7 @@ (defcustom org-confirm-elisp-link-not-regexp "" "A regexp to skip confirmation for Elisp links." :group 'org-link-follow + :version "24.1" :type 'regexp) (defconst org-file-apps-defaults-gnu @@ -1908,6 +1920,7 @@ will temporarily be changed to `time'." :group 'org-refile :group 'org-progress + :version "24.1" :type '(choice (const :tag "No logging" nil) (const :tag "Record timestamp" time) @@ -1983,6 +1996,7 @@ you need to clear the cache manually by pressing `C-0 C-c C-w' or, if you find that easier, `C-u C-u C-u C-c C-w'." :group 'org-refile + :version "24.1" :type 'boolean) (defcustom org-refile-use-outline-path nil @@ -2038,6 +2052,7 @@ do so sometimes: in that case, the first line of the region is converted to a headline before refiling." :group 'org-refile + :version "24.1" :type 'boolean) (defgroup org-todo nil @@ -2511,6 +2526,7 @@ in a TODO_TYP set. But you can specify another task here. alternatively, set the :REPEAT_TO_STATE: property of the entry." :group 'org-todo + :version "24.1" :type '(choice (const :tag "Head of sequence" nil) (string :tag "Specific state"))) @@ -2595,6 +2611,7 @@ The user can set a different function here, which should take a string as an argument and return the numeric priority." :group 'org-priorities + :version "24.1" :type 'function) (defgroup org-time nil @@ -2736,6 +2753,7 @@ This may t or nil, or the symbol `org-read-date-prefer-future'." :group 'org-agenda :group 'org-time + :version "24.1" :type '(choice (const :tag "Use org-read-date-prefer-future" org-read-date-prefer-future) @@ -2770,6 +2788,7 @@ A workaround for this problem is to use diary sexp dates for time stamps outside of this range." :group 'org-time + :version "24.1" :type 'boolean) (defcustom org-read-date-display-live t @@ -2817,6 +2836,7 @@ \"effective time\" of any timestamps between midnight and 8am will be 23:59 of the previous day." :group 'org-time + :version "24.1" :type 'boolean) (defcustom org-edit-timestamp-down-means-later nil @@ -2890,6 +2910,7 @@ 'org-complete-tags-always-offer-all-agenda-tags) t)))" :group 'org-tags + :version "24.1" :type 'boolean) (defvar org-file-tags nil @@ -3058,6 +3079,7 @@ (org-entry-get (point) \"Effort\")))) (org-minutes-to-hh:mm-string (- effort clocksum))))))" :group 'org-properties + :version "24.1" :type 'alist) (defcustom org-use-property-inheritance nil @@ -3329,6 +3351,7 @@ "Non-nil means signal an error when image creation of LaTeX snippets fails. When nil, just push out a message." :group 'org-latex + :version "24.1" :type 'boolean) (defcustom org-latex-to-mathml-jar-file nil "Value of\"%j\" in `org-latex-to-mathml-convert-command'. @@ -3337,6 +3360,7 @@ When using MathToWeb as the converter, specify the full-path to your mathtoweb.jar file." :group 'org-latex + :version "24.1" :type '(choice (const :tag "None" nil) (file :tag "JAR file" :must-match t))) @@ -3354,6 +3378,7 @@ When using MathToWeb as the converter, set this to \"java -jar %j -unicode -force -df %o %I\"." :group 'org-latex + :version "24.1" :type '(choice (const :tag "None" nil) (string :tag "\nShell command"))) @@ -3463,6 +3488,7 @@ :group 'org-export-latex :set 'org-set-packages-alist :get 'org-get-packages-alist + :version "24.1" :type '(repeat (choice (list :tag "options/package pair" @@ -3528,6 +3554,7 @@ For example, a value '(title) for this list will make the document's title appear in the buffer without the initial #+TITLE: keyword." :group 'org-appearance + :version "24.1" :type '(set (const :tag "#+AUTHOR" author) (const :tag "#+DATE" date) (const :tag "#+EMAIL" email) @@ -3568,11 +3595,13 @@ "Non-nil means show entities as UTF8 characters. When nil, the \\name form remains in the buffer." :group 'org-appearance + :version "24.1" :type 'boolean) (defcustom org-pretty-entities-include-sub-superscripts t "Non-nil means, pretty entity display includes formatting sub/superscripts." :group 'org-appearance + :version "24.1" :type 'boolean) (defvar org-emph-re nil @@ -5356,6 +5385,7 @@ (defcustom org-src-fontify-natively nil "When non-nil, fontify code in code blocks." :type 'boolean + :version "24.1" :group 'org-appearance :group 'org-babel) @@ -16205,6 +16235,7 @@ For example, if the value of this variable is ((\"hours\" . 60)), then an effort string \"2hours\" is equivalent to 120 minutes." :group 'org-agenda + :version "24.1" :type '(alist :key-type (string :tag "Modifier") :value-type (number :tag "Minutes"))) ------------------------------------------------------------ revno: 107744 committer: Bastien Guerry branch nick: trunk timestamp: Tue 2012-04-03 12:28:31 +0200 message: Fix small regressions in Org diff: === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2012-04-02 15:42:03 +0000 +++ lisp/org/ChangeLog 2012-04-03 10:28:31 +0000 @@ -1,3 +1,9 @@ +2012-04-03 Bastien Guerry + + * org.el (org-todo): Fix regression: rename `state' to + `org-state'. + (org-use-effective-time): Fix group and type. + 2012-04-02 Bastien Guerry * org-clock.el (org-clock-out-if-current): Fix regression: rename === modified file 'lisp/org/org.el' --- lisp/org/org.el 2012-04-02 15:42:03 +0000 +++ lisp/org/org.el 2012-04-03 10:28:31 +0000 @@ -2816,8 +2816,8 @@ For example, if `org-extend-today-until' is 8, and it's 4am, then the \"effective time\" of any timestamps between midnight and 8am will be 23:59 of the previous day." - :group 'boolean - :type 'integer) + :group 'org-time + :type 'boolean) (defcustom org-edit-timestamp-down-means-later nil "Non-nil means S-down will increase the time in a time stamp. @@ -11380,7 +11380,7 @@ ;; It is now done, and it was not done before (org-add-planning-info 'closed (org-current-effective-time)) (if (and (not dolog) (eq 'note org-log-done)) - (org-add-log-setup 'done state this 'findpos 'note))) + (org-add-log-setup 'done org-state this 'findpos 'note))) (when (and org-state dolog) ;; This is a non-nil state, and we need to log it (org-add-log-setup 'state org-state this 'findpos dolog))) ------------------------------------------------------------ revno: 107743 committer: Chong Yidong branch nick: trunk timestamp: Tue 2012-04-03 18:21:47 +0800 message: Two minor doc/consistency fixes. * doc/emacs/sending.texi (Mail Misc): Fix an index entry. * lisp/mail/sendmail.el (mail-mode-map): Bind C-c C-i to mail-insert-file, not its obsolete alias mail-attach-file. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-04-02 17:33:41 +0000 +++ doc/emacs/ChangeLog 2012-04-03 10:21:47 +0000 @@ -1,3 +1,7 @@ +2012-04-03 Chong Yidong + + * sending.texi (Mail Misc): Fix an index entry. + 2012-04-02 Eli Zaretskii * msdog.texi (Windows Startup): Add description of emacsclient === modified file 'doc/emacs/sending.texi' --- doc/emacs/sending.texi 2012-02-15 03:15:26 +0000 +++ doc/emacs/sending.texi 2012-04-03 10:21:47 +0000 @@ -521,7 +521,7 @@ @subsection Mail Miscellany @kindex C-c C-a @r{(Message mode)} -@findex mail-attach-file +@findex mml-attach-file @cindex MIME @cindex Multipurpose Internet Mail Extensions You can @dfn{attach} a file to an outgoing message by typing === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-03 07:20:32 +0000 +++ lisp/ChangeLog 2012-04-03 10:21:47 +0000 @@ -1,3 +1,8 @@ +2012-04-03 Chong Yidong + + * mail/sendmail.el (mail-mode-map): Bind C-c C-i to + mail-insert-file, not its obsolete alias mail-attach-file. + 2012-04-03 Michael Albinus * notifications.el (notifications-notify): Fix docstring. === modified file 'lisp/mail/sendmail.el' --- lisp/mail/sendmail.el 2012-03-13 23:27:56 +0000 +++ lisp/mail/sendmail.el 2012-04-03 10:21:47 +0000 @@ -304,7 +304,7 @@ (define-key map "\C-c\C-w" 'mail-signature) (define-key map "\C-c\C-c" 'mail-send-and-exit) (define-key map "\C-c\C-s" 'mail-send) - (define-key map "\C-c\C-i" 'mail-attach-file) + (define-key map "\C-c\C-i" 'mail-insert-file) ;; FIXME add this? "b" = bury buffer. It's in the menu-bar. ;;; (define-key map "\C-c\C-b" 'mail-dont-send) ------------------------------------------------------------ revno: 107742 committer: Chong Yidong branch nick: trunk timestamp: Tue 2012-04-03 18:16:54 +0800 message: Reorder and edit some NEWS entries. diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-04-03 08:18:10 +0000 +++ etc/NEWS 2012-04-03 10:16:54 +0000 @@ -56,23 +56,22 @@ `--without-xml2'. See below for libxml2 features. --- -** There is a new configure option --with-wide-int. +** By default, the installed Info and man pages are compressed. +You can disable this by configuring --without-compress-info. + +--- +** New configure option --with-wide-int. With it, Emacs integers typically have 62 bits, even on 32-bit machines. On 32-bit hosts, this raises the limit on buffer sizes from about 512 MiB to about 2 GiB. --- -** By default, the installed Info and man pages are compressed. -You can disable this by configuring --without-compress-info. - ---- -** There are new configure options: ---with-mmdf, --with-mail-unlink, --with-mailhost. +** New configure options: --with-mmdf, --with-mail-unlink, --with-mailhost. These provide no new functionality, they just remove the need to edit lib-src/Makefile by hand in order to use the associated features. --- -** There is a new configure option --enable-use-lisp-union-type. +** New configure option --enable-use-lisp-union-type. This is only useful for Emacs developers to debug certain types of bugs. This is not a new feature; only the configure flag is new. @@ -101,12 +100,9 @@ * Changes in Emacs 24.1 -+++ -** auto-mode-case-fold is now enabled by default. - ** Completion -*** shell-mode uses pcomplete rules, with the standard completion UI. +*** Shell mode uses pcomplete rules, with the standard completion UI. +++ *** Many packages have been changed to use `completion-at-point' rather than their own completion code. @@ -116,7 +112,7 @@ *** Completion in a non-minibuffer now tries to detect the end of completion and pops down the *Completions* buffer accordingly. +++ -*** Completion can cycle, depending on completion-cycle-threshold. +*** Completion can cycle, depending on `completion-cycle-threshold'. +++ *** New completion style `substring'. +++ @@ -127,80 +123,29 @@ *** The `widget-complete-field' option has been removed. ** Mail changes - -+++ -*** The default of `send-mail-function' is now `sendmail-query-once', -which asks the user (once) whether to use the smtpmail package to send -email, or to use the old defaults that rely on external mail -facilities (`sendmail-send-it' on GNU/Linux and other Unix-like -systems, and `mailclient-send-it' on Windows). - ---- -*** `compose-mail' now accepts an optional 8th arg, RETURN-ACTION, and -passes it to the mail user agent function. This argument specifies an -action for returning to the caller after finishing with the mail. -For example, this is used by Rmail to optionally delete a mail window. - -*** smtpmail - -+++ -**** smtpmail now uses encrypted connections (via STARTTLS) by default -if the mail server supports them. This uses either built-in GnuTLS -support, or the starttls.el library. Customize `smtpmail-stream-type' -to change this. - -+++ -**** The variable `smtpmail-auth-credentials' has been removed. -By default, the information is now stored in the file ~/.authinfo. -This was the default value of smtpmail-auth-credentials. -If you had customized smtpmail-auth-credentials to a list of user -names and passwords, those settings will not be used. Your first -connection to the smtp server will prompt for the user name and password, -and then offer to save them to the ~/.authinfo file. Or you can -manually copy the credentials to your ~/.authinfo files. For example, -if you had - - (setq smtpmail-auth-credentials - '(("mail.example.org" 25 "jim" "s!cret"))) - -then the equivalent line in ~/.authinfo would be - - machine mail.example.org port 25 login jim password s!cret - -See the auth-source manual for more information, e.g. on encrypting -the credentials file. - -+++ -**** The variable `smtpmail-starttls-credentials' has been removed. - -If you had that set, then you need to put - - machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert" - -in your ~/.authinfo file instead. - -*** Mail mode changes (this is the old Mail mode, not Message mode) -+++ -**** New command `mail-add-attachment' for adding MIME attachments ---- -**** The command `mail-attach-file' was renamed to `mail-insert-file'. -The old name is now an obsolete alias to the new name. - -+++ -*** You can type C-c m from M-x report-emacs-bug if you prefer, and if -your system supports it, to transfer your report to your desktop's -preferred mail client. This uses either the "xdg-email" utility, or -OS X's "open" command. ++++ +*** The first time you try sending mail, Emacs asks for a mail method. +This is implemented by a new default for `send-mail-function', which +is `sendmail-query-once'. This offers to use the smtpmail package, or +to use the old defaults relying on external mail facilities +(`sendmail-send-it' on GNU/Linux and other Unix-like systems, and +`mailclient-send-it' on Windows). ++++ +*** Typing C-c m in the buffer made by M-x report-emacs-bug transfers +the report to your desktop's preferred mail client, if there is one. +This uses either the "xdg-email" utility, or Mac OS's "open" command. +--- +*** See Changes in Specialized Modes and Packages for SMTPmail changes +and Mail mode changes ** Emacs server and client changes +++ -*** New option `server-port' specifies the port on which the Emacs -server should listen. +*** New option `server-port' specifies the port for TCP Emacs servers. +++ *** New emacsclient argument -q/--quiet suppresses some status messages. +++ -*** New emacsclient argument --frame-parameters can be used to set the -frame parameters of a newly-created graphical frame. +*** New emacsclient argument --frame-parameters specifies the frame +parameters of any newly-created graphical frame. +++ *** If emacsclient shuts down as a result of Emacs signaling an error, its exit status is 1. @@ -213,32 +158,25 @@ +++ *** Emacs now supports display and editing of bidirectional text. - -Text that includes characters from right-to-left (RTL) scripts, such -as Arabic, Farsi, or Hebrew, is displayed in the correct visual order -as expected by users of those scripts. This display reordering is a -"Full bidirectionality" class implementation of the Unicode -Bidirectional Algorithm. Buffers with no RTL text should look exactly -the same as before. - -For more information, see the node "Bidirectional Editing" in the -Emacs Manual. +Right-to-left (RTL) scripts, such as Arabic, Farsi, and Hebrew, are +displayed in the correct visual order as expected by users of those +scripts. This display reordering is a "full bidirectionality" class +implementation of the Unicode Bidirectional Algorithm. Buffers with +no RTL text should look exactly the same as before. +++ **** New buffer-local variable `bidi-display-reordering'. -To disable display reordering in any given buffer, change this to nil. +To disable display reordering in a buffer, change this to nil. +++ **** New buffer-local variable `bidi-paragraph-direction'. If nil (the default), Emacs determines the base direction of each paragraph from its text, as specified by the Unicode Bidirectional -Algorithm. - -Setting this to `right-to-left' or `left-to-right' forces a particular -base direction on each paragraph in the buffer. - -Paragraphs whose base direction is right-to-left are displayed -starting at the right margin of the window. +Algorithm. Setting the value to `right-to-left' or `left-to-right' +forces a base direction on each paragraph. + +Paragraphs with right-to-left base direction are displayed starting at +the right window edge. +++ *** Enhanced support for characters with no glyphs in available fonts. @@ -253,80 +191,79 @@ cannot be encoded by the `terminal-coding-system'. --- -*** New input methods for Farsi: farsi and farsi-translit; -and for Bulgarian: bulgarian-alt-phonetic. +*** New input methods: farsi, farsi-translit, bulgarian-alt-phonetic. +++ *** `nobreak-char-display' now also highlights Unicode hyphen chars (U+2010 and U+2011). --- -*** New translation of the Emacs Tutorial in Hebrew is available. +*** New Hebrew translation of the Emacs Tutorial. Type `C-u C-h t' to choose it in case your language setup doesn't automatically select it. +** An Emacs Lisp package manager is now included. +This is a convenient way to download and install additional packages, +from a package repository at http://elpa.gnu.org. ++++ +*** M-x list-packages shows a list of packages, which can be +selected for installation. ++++ +*** New command `describe-package', bound to `C-h P'. ++++ +*** By default, all installed packages are loaded automatically when +Emacs starts up. To disable this, set `package-enable-at-startup' to +nil. To specify the packages to load, customize `package-load-list'. + +** Custom Themes ++++ +*** New command `M-x customize-themes', which provides a convenient +interface for enabling and disabling Custom themes. ++++ +*** New option `custom-theme-load-path' is the load path for themes. +Emacs no longer looks for custom themes in `load-path'. The default +is to search in `custom-theme-directory', followed by a built-in theme +directory named "themes/" in `data-directory'. ++++ +*** New option `custom-safe-themes' records known-safe theme files. +If a theme is not in this list, Emacs queries before loading it, and +offers to save the theme to `custom-safe-themes' automatically. By +default, all themes included in Emacs are treated as safe. + ** Improved GTK integration +++ *** GTK scroll-bars are now placed on the right by default. Use `set-scroll-bar-mode' to change this. +++ *** GTK tool bars can have just text, just images or images and text. -Customize `tool-bar-style' to choose style. On a Gnome desktop, the default -is taken from the desktop settings. +Customize `tool-bar-style' to choose style. On a Gnome desktop, the +default is taken from desktop settings. --- *** GTK tool bars can be placed on the left/right or top/bottom of the frame. -The frame-parameter tool-bar-position controls this. It takes the values -top, left, right or bottom. The Options => Show/Hide menu has entries -for this. -+++ -*** The colors for selected text (the `region' face) are taken from -the GTK theme when Emacs is built with GTK. -+++ -*** Emacs uses GTK tooltips by default if built with GTK. You can turn that -off by customizing x-gtk-use-system-tooltips. - -+++ -** New basic faces `error', `warning', `success' are available to -highlight strings that indicate failure, caution or successful operation. - ---- -** Lucid menus and dialogs can display antialiased fonts if Emacs is built -with Xft. To change font, use the X resource font, for example: -Emacs.pane.menubar.font: Courier-12 - -+++ -** On graphical displays, the mode-line no longer ends in dashes. -Also, the first dash (which does not indicate anything) is just -displayed as a space. - -+++ -** Basic SELinux support has been added. -This requires Emacs to be linked with libselinux at build time. - -+++ -*** Emacs preserves the SELinux file context when backing up, and -optionally when copying files. To this end, `copy-file' has an extra -optional argument, and the return value of `backup-buffer' now -includes the SELinux context. - -+++ -*** The new functions file-selinux-context and set-file-selinux-context -get and set the SELinux context of a file. - -** Changes for exiting Emacs -+++ -*** The function kill-emacs is now run upon receipt of the signals -SIGTERM and SIGHUP, and upon SIGINT in batch mode. -+++ -*** kill-emacs-hook is now also run in batch mode. -If you have code that adds something to kill-emacs-hook, you should -consider if it is still appropriate to add it in the noninteractive case. +The frame-parameter tool-bar-position controls this. It takes the +values top, left, right or bottom. The Options => Show/Hide menu has +entries for this. ++++ +*** The default colors for selected text (the `region' face) are taken +from the GTK theme when Emacs is built with GTK. ++++ +*** Emacs uses GTK tooltips by default if built with GTK. +You can disable this by changing `x-gtk-use-system-tooltips' to nil. + +** Exiting changes ++++ +*** Emacs now calls `kill-emacs' if it receives SIGTERM or SIGHUP, +and also if it receives a SIGINT signal in batch mode. ++++ +*** `kill-emacs-hook' is now also run in batch mode. +Third-party code which adds to `kill-emacs-hook' should check if they +do the right thing in batch mode. ** Scrolling changes +++ *** New scrolling commands `scroll-up-command' and `scroll-down-command' (bound to C-v/[next] and M-v/[prior]) do not signal errors at top/bottom -of buffer at first key-press (instead move to top/bottom of buffer) +of buffer at first key-press (instead they move to top/bottom of buffer) when `scroll-error-top-bottom' is non-nil. +++ *** New variable `scroll-error-top-bottom' (see above). @@ -343,12 +280,26 @@ Previously, you needed to use `most-positive-fixnum' as the value of `scroll-conservatively' to achieve the same effect. --- -*** ``Aggressive'' scrolling now honors the scroll margins. +*** "Aggressive" scrolling now honors the scroll margins. If you customize `scroll-up-aggressively' or `scroll-down-aggressively' and move point off the window, Emacs now scrolls the window so as to avoid positioning point inside the scroll margin. ++++ +** Basic SELinux support has been added. +This requires Emacs to be linked with libselinux at build time. + ++++ +*** Emacs preserves the SELinux file context when backing up, and +optionally when copying files. The function `copy-file' has an extra +optional argument for preserving SELinux context, and the return value +of `backup-buffer' now includes the SELinux context. + ++++ +*** The new functions file-selinux-context and set-file-selinux-context +get and set the SELinux context of a file. + ** Trash changes +++ *** `delete-by-moving-to-trash' now only affects commands that specify @@ -357,38 +308,6 @@ *** Calling `delete-file' or `delete-directory' with a prefix argument now forces true deletion, regardless of `delete-by-moving-to-trash'. -+++ -** New option `list-colors-sort' defines the color sort order -for `list-colors-display'. - -** An Emacs Lisp package manager is now included. -This is a convenient way to download and install additional packages, -from a package repository at http://elpa.gnu.org. -+++ -*** `M-x list-packages' shows a list of packages, which can be -selected for installation. -+++ -*** New command `describe-package', bound to `C-h P'. -+++ -*** By default, all installed packages are loaded and activated -automatically when Emacs starts up. To disable this, set -`package-enable-at-startup' to nil. To change which packages are -loaded, customize `package-load-list'. - -** Custom Themes -+++ -*** `M-x customize-themes' lists Custom themes which can be enabled. -+++ -*** New option `custom-theme-load-path' is the load path for themes. -Emacs no longer looks for custom themes in `load-path'. The default -is to search in `custom-theme-directory', followed by a built-in theme -directory named "themes/" in `data-directory'. -+++ -*** New option `custom-safe-themes' records known-safe theme files. -If a theme is not in this list, Emacs queries before loading it, and -offers to save the theme to `custom-safe-themes' automatically. By -default, all themes included in Emacs are treated as safe. - ** File- and directory-local variable changes +++ *** You can stop directory local vars from applying to subdirectories. @@ -412,18 +331,30 @@ The associated `inhibit-first-line-modes-suffixes' has been renamed in the corresponding way. -+++ -** The variable `focus-follows-mouse' now always defaults to nil. - -+++ -** New primitive `secure-hash' that supports many secure hash algorithms: -md5, sha1, sha2, sha224, sha256, sha384, and sha512. The lisp library -sha1.el has been removed. The `sha1' feature is provided by default. - -** Menu-bar changes +** Graphical interface changes ++++ +*** On graphical displays, the mode-line no longer ends in dashes. +Also, the first dash (which does not indicate anything) is just +displayed as a space. --- *** `menu-bar-select-buffer-function' lets you choose another operation instead of `switch-to-buffer' when selecting an item in the Buffers menu. +--- +*** Lucid menus and dialogs can display antialiased fonts if Emacs is +built with Xft. These fonts can be set via X resources, for example: +Emacs.pane.menubar.font: Courier-12 + ++++ +** New basic faces `error', `warning', `success'. +These are used to highlight text indicating failure, caution or +successful operation. + ++++ +** New option `list-colors-sort' defines the color sort order +for `list-colors-display'. + ++++ +** The variable `focus-follows-mouse' now always defaults to nil. ** Window changes @@ -466,15 +397,22 @@ These functions allow to navigate through the live buffers that have been shown in a specific window. +** Minibuffer changes +++ -** The inactive minibuffer has its own major mode `minibuffer-inactive-mode'. +*** The inactive minibuffer has its own major mode `minibuffer-inactive-mode'. This is handy for minibuffer-only frames, and is also used for the feature where mouse-1 pops up *Messages*"', which can now easily be changed. --- -** Minibuffers set `truncate-lines' to nil. +*** Minibuffers set `truncate-lines' to nil. If you want to change the value to something else, you could use -for example minibuffer-setup-hook. +for example `minibuffer-setup-hook'. + ++++ +** `auto-mode-case-fold' is now enabled by default. + ++++ +** `backup-by-copying-when-mismatch' now defaults to t. * Editing Changes in Emacs 24.1 @@ -499,9 +437,6 @@ alias for it. +++ -** The default value of `backup-by-copying-when-mismatch' is now t. - -+++ ** The command `just-one-space' (M-SPC), if given a negative argument, also deletes newlines around point. @@ -518,17 +453,17 @@ --- *** `delete-backward-char' is now a Lisp function. Apart from obeying `delete-active-region', its behavior is unchanged. -However, the byte compiler now warns if it is called from Lisp; you -should use delete-char with a negative argument instead. +However, the byte compiler now warns if it is called from Lisp; Lisp +callers should use delete-char with a negative argument instead. --- *** The option `mouse-region-delete-keys' has been deleted. ** Selection changes. -The default handling of clipboard and primary selections was changed -to conform with modern X applications. In short, most commands for -killing and yanking text now use the clipboard, while mouse commands -use the primary selection. +The default handling of clipboard and primary selections has been +changed to conform with modern X applications. In short, most +commands for killing and yanking text now use the clipboard, while +mouse commands use the primary selection. In the following, we provide a list of these changes, followed by a list of steps to get the old behavior back if you prefer that. @@ -589,7 +524,7 @@ prompts for a number to count from and for a format string. +++ -** The default value of redisplay-dont-pause is now t +** `redisplay-dont-pause' now defaults to t. This makes Emacs feel more responsive to editing commands that arrive at high rate, e.g. if you lean on some key, because stopping redisplay in the middle (when this variable is nil) forces more expensive @@ -611,8 +546,10 @@ ** BibTeX mode --- *** BibTeX mode now supports biblatex. -Use the variable bibtex-dialect to select different BibTeX dialects. -bibtex-entry-field-alist is now an obsolete alias forbibtex-BibTeX-entry-alist. +Use the variable `bibtex-dialect' to select different BibTeX dialects. +`bibtex-entry-field-alist' is now an obsolete alias for +`bibtex-BibTeX-entry-alist'. + --- *** New command `bibtex-search-entries' bound to C-c C-a. --- @@ -620,10 +557,17 @@ --- *** New variable `bibtex-search-entry-globally'. +** Browse-url ++++ +*** New option `browse-url-mailto-function' specifies how to handle "mailto:"s. +--- +*** The default browser used by the package is now the "xdg-open" program, +on platforms that support it. This calls your desktop's preferred browser. + ** Calendar, Diary, and Appt +++ -*** Diary entries can contain non-printing `comments'. +*** Diary entries can contain non-printing "comments". See the variable `diary-comment-start'. +++ @@ -643,8 +587,9 @@ may no longer be nil, but must all be strings. --- -*** The obsolete (since Emacs 22.1) method of enabling the appt package -by adding appt-make-list to diary-hook has been removed. Use appt-activate. +*** The obsolete (since Emacs 22.1) method of enabling the appt +package by adding `appt-make-list' to `diary-hook' has been removed. +Use `appt-activate' instead. --- *** Some appt variables (obsolete since Emacs 22.1) have been removed: @@ -655,19 +600,10 @@ *** Some diary function aliases (obsolete since Emacs 22.1) have been removed: view-diary-entries, list-diary-entries, show-all-diary-entries -** Browse-url - -+++ -*** New option `browse-url-mailto-function' specifies how to handle "mailto:"s. - ---- -*** The default browser used by the package is now the "xdg-open" program, -on platforms that support it. This calls your desktop's preferred browser. - +++ ** CC Mode *** New feature to "guess" the style in an existing buffer. -The main entry is M-x c-guess. +The main entry point is M-x c-guess. *** Java Mode now supports Java 5.0 (Tiger) and 6 (Mustang). @@ -683,26 +619,26 @@ ** Compilation mode --- -*** Compilation mode can be used without font-lock-mode. +*** Compilation mode can be used without Font Lock mode. `compilation-parse-errors-function' is now obsolete. --- *** New variable `compilation-filter-start', bound while -compilation-filter-hook runs. It records the start position of the -text inserted by compilation-filter. +`compilation-filter-hook' runs. It records the start position of the +text inserted by `compilation-filter'. --- *** `compilation-error-screen-columns' and `compilation-first-column' are obeyed in the editing buffer. So programming language modes can -set them, whereas previously only the value in the *compilation* buffer -was used. +set them, whereas previously only the value in the *Compilation* +buffer was used. ** Customize +++ *** Customize buffers now contain a search field. The search is performed using `customize-apropos'. -To turn off the search field, set custom-search-field to nil. +To turn off the search field, set `custom-search-field' to nil. +++ *** Custom options now start out hidden if at their default values. @@ -713,26 +649,28 @@ +++ *** The color widget now has a "Choose" button, which allows you to -choose a color via list-colors-display. +choose a color via `list-colors-display'. ** D-Bus *** It is now possible to access buses other than the default system or session bus. -*** The dbus-register-method and dbus-register-property functions +*** The `dbus-register-method' and `dbus-register-property' functions optionally do not register names. -*** The new function dbus-register-service registers a known service name -on a D-Bus without simultaneously registering a property or a method. +*** The new function `dbus-register-service' registers a known service +name on a D-Bus without simultaneously registering a property or a +method. ** Dired-x --- -*** dired-jump and dired-jump-other-window called with a prefix argument -read a file name from the minibuffer instead of using buffer-file-name. +*** C-x C-j (`dired-jump') and C-x 4 C-j (`dired-jump-other-window'), +if called with a prefix argument, read a file name from the minibuffer +instead of using the current buffer. +++ -*** The `dired local variables' feature provided by Dired-x is obsolete. +*** The "dired local variables" feature of Dired-x is obsolete. The standard directory local variables feature replaces it. ** ERC changes @@ -768,7 +706,7 @@ ** Info +++ -*** New command `info-display-manual' displays a named Info manual. +*** New command M-x info-display-manual displays a named Info manual. If that manual is already visited in some Info buffer, it displays that buffer. (This is handy if you have many manuals in many *info* buffers, and don't remember the name of the buffer visiting the manual @@ -780,6 +718,14 @@ and also because `Info-edit' is a rarely used command that is disabled by default. +** Mail mode changes (not Message mode) ++++ +*** New command M-x mail-add-attachment for adding MIME attachments +--- +*** The command `mail-attach-file' was renamed to `mail-insert-file' +(its name is misleading, since it has nothing to do with MIME +attachments). The old name is now an obsolete alias to the new name. + +++ ** MH-E has been upgraded to MH-E version 8.3.1. See MH-E-NEWS for details. @@ -797,8 +743,8 @@ --- ** Prolog mode has been completely revamped, with lots of additional -functionality such as more intelligent indentation, electricity, support for -more variants, including Mercury, and a lot more. +functionality such as more intelligent indentation, electricity, +support for more variants, including Mercury, and a lot more. ** Rmail @@ -819,6 +765,44 @@ directory is a remote file name and neither the environment variable $ESHELL nor the variable `explicit-shell-file-name' is set. +** SMTPmail + ++++ +*** smtpmail now uses encrypted connections (via STARTTLS) by default +if the mail server supports them. This uses either built-in GnuTLS +support, or the starttls.el library. Customize `smtpmail-stream-type' +to change this. + ++++ +*** The variable `smtpmail-auth-credentials' has been removed. +By default, the information is now stored in the file ~/.authinfo. +This was the default value of smtpmail-auth-credentials. +If you had customized smtpmail-auth-credentials to a list of user +names and passwords, those settings will not be used. Your first +connection to the smtp server will prompt for the user name and password, +and then offer to save them to the ~/.authinfo file. Or you can +manually copy the credentials to your ~/.authinfo files. For example, +if you had + + (setq smtpmail-auth-credentials + '(("mail.example.org" 25 "jim" "s!cret"))) + +then the equivalent line in ~/.authinfo would be + + machine mail.example.org port 25 login jim password s!cret + +See the auth-source manual for more information, e.g. on encrypting +the credentials file. + ++++ +*** The variable `smtpmail-starttls-credentials' has been removed. + +If you had that set, then you need to put + + machine smtp.whatever.foo port 25 key "~/.my_smtp_tls.key" cert "~/.my_smtp_tls.cert" + +in your ~/.authinfo file instead. + --- ** SQL mode @@ -873,7 +857,7 @@ ** Tramp --- -*** There exists a new inline access method "ksu" (kerberized su). +*** New inline access method "ksu" (kerberized su). --- *** The following access methods are discontinued: "ssh1_old", "ssh2_old", "scp1_old", "scp2_old", "imap", "imaps" and "fish". @@ -884,8 +868,8 @@ *** The option `ange-ftp-binary-file-name-regexp' has changed its default value to "". --- -*** Handlers for file-selinux-context and set-file-selinux-context for -remote machines that support SELinux. +*** Handlers for `file-selinux-context' and `set-file-selinux-context' +for remote machines which support SELinux. +++ ** New function, `url-queue-retrieve', which behaves like url-retrieve, @@ -896,20 +880,20 @@ +++ *** Support for pulling on distributed version control systems. -`C-x v +' (`vc-pull') runs a "pull" operation, if it is supported -(currently with Bzr, Git, and Mercurial), to update the current branch -and working tree. A prefix argument means to prompt the user for -specifics, e.g. a pull location. +The command C-x v + (`vc-pull') runs a "pull" operation, if it is +supported (currently with Bzr, Git, and Mercurial), to update the +current branch and working tree. A prefix argument means to prompt +the user for specifics, e.g. a pull location. --- *** `vc-update' is now an alias for `vc-pull'. +++ *** Support for merging on distributed version control systems. -The vc-merge command now runs a "merge" operation, if it is supported -(currently with Bzr, Git, and Mercurial), to merge changes from -another branch into the current one. It prompts for specifics, e.g. a -merge source. +The command C-x v m (`vc-merge') now runs a "merge" operation, if it +is supported (currently with Bzr, Git, and Mercurial), to merge +changes from another branch into the current one. It prompts for +specifics, e.g. a merge source. +++ *** New option `vc-revert-show-diff' controls whether `vc-revert' @@ -920,7 +904,7 @@ longer description by typing RET (log-view-toggle-entry-display). This is currently supported for Bzr, Git, and Mercurial (to support another backend, define a `log-view-expanded-log-entry-function'). -In the Log View buffers made by `C-x v L' (vc-print-root-log), you can +In the Log View buffers made by C-x v L (`vc-print-root-log'), you can use this to display the full log entry for the revision at point. +++ @@ -952,7 +936,6 @@ --- *** pc-mode.el is obsolete (CUA mode is much more comprehensive). -[FIXME gnus.texi, message.texi need updating] *** pgg is obsolete (use EasyPG instead) --- @@ -1038,22 +1021,32 @@ --- ** New emacs-lock.el package. -(The previous version has been moved to obsolete/old-emacs-lock.el.) -Now, there is a proper minor mode `emacs-lock-mode'. -Protection against exiting Emacs and killing the buffer can be set -separately. The mechanism for automatically turning off protection -for buffers with dead inferior processes has been generalized. +The previous version has been moved to obsolete/old-emacs-lock.el. +Now, there is a proper minor mode `emacs-lock-mode'. Protection +against exiting Emacs and killing the buffer can be set separately. +The mechanism for automatically turning off protection for buffers +with dead inferior processes has been generalized. * Incompatible Lisp Changes in Emacs 24.1 +++ +** Passing a nil argument to a minor mode function call now ENABLES +the minor mode unconditionally. This is so that you can write e.g. + + (add-hook 'text-mode-hook 'foo-minor-mode) + +to enable foo-minor-mode in Text mode buffers, removing the need for +`turn-on-foo-minor-mode' style functions. This affects all mode +commands defined by `define-minor-mode'. If called interactively, the +mode command still toggles the minor mode. + ++++ ** The return value of `backup-buffer' has changed. It is now a list of three elements, where the second element is a list describing the original file's SELinux context. If Emacs or the system lacks SELinux support, the context list is (nil nil nil nil). -See the "Basic SELinux support" entry under "Changes in Emacs 24.1", -above. +See "Basic SELinux support" above, under "Changes in Emacs 24.1". --- ** `char-direction-table' and the associated function `char-direction' @@ -1075,19 +1068,19 @@ of the header line. --- -** Support for "old-style" backquotes, which have been obsolete for -more than 10 years, has been further reduced. Now a backquote not -followed by a space is always treated as a "new-style" backquote. -Please remove all "old-style" backquotes from your code. If your code -uses backquotes as documented in the Elisp manual, and compiles -without warning, then you have nothing to do in this regard. Code not -following the appropriate conventions may fail to compile. +** Support for "old-style" backquotes, obsolete for 10+ years, has +been further reduced. Now a backquote not followed by a space is +always treated as a "new-style" backquote. Please remove all +"old-style" backquotes from your code. If your code uses backquotes +as documented in the Elisp manual, and compiles without warning, then +you have nothing to do in this regard. Code not following the +appropriate conventions may fail to compile. The most common cause of trouble seems to be an old-style backquote followed by a newline. Another cause of trouble is vector notation for key sequence notation: instead of [(control ,)] and [(control ')], you should write [(control ?,)] and [(control ?')], which will work in -older Emacs too. +older Emacsen too. +++ ** The macro `eval-at-startup' was removed in Emacs 23.2, but this @@ -1095,19 +1088,14 @@ replaced all known uses. --- -** view-buffer now treats special mode-class in the same way that -view-file has since Emacs 22 (ie, it won't enable View mode if the -major-mode is special). - -+++ -** Passing a nil argument to a minor mode defined by define-minor-mode -now turns the mode ON unconditionally. This is so that you can write, e.g. - (add-hook 'text-mode-hook 'foo-minor-mode) -to enable foo-minor-mode in Text mode buffers, thus removing the need -for `turn-on-foo-minor-mode' style functions. - -+++ -** During startup, Emacs no longer adds entries for `menu-bar-lines' +** `view-buffer' now treats special mode-class in the same way that +`view-file' has since Emacs 22 (i.e. it won't enable View mode if the +major mode is special). + +** Menu and tool bar changes + ++++ +*** During startup, Emacs no longer adds entries for `menu-bar-lines' and `tool-bar-lines' to `default-frame-alist' and `initial-frame-alist'. With these alist entries omitted, `make-frame' checks the value of the variable `menu-bar-mode'/`tool-bar-mode' to determine whether to create @@ -1115,61 +1103,69 @@ they override the value of `menu-bar-mode'/`tool-bar-mode'. +++ +*** The menu bar bindings's caches are not used any more. +Use (where-is-internal nil t) instead. + ++++ ** Regions created by mouse dragging are now normal active regions, -similar to the ones created by shift-selection. In previous Emacs -versions, these regions were delineated by `mouse-drag-overlay', which -has now been removed. +similar to the ones created by shift-selection (see Selection changes +above). In previous Emacs versions, these regions were delineated by +`mouse-drag-overlay'; that variable has been removed. +++ -** The fourth argument of filter-buffer-substring, which says to remove -text properties from the final result, has been removed. -Eg simply pass the result through substring-no-properties if you need this. +** The fourth argument of `filter-buffer-substring' has been removed. +If you want to remove text properties from the final result, simply +pass the result through substring-no-properties. --- ** cl.el no longer provides `cl-19'. +++ -** The menu bar bindings's caches are not used any more. -Use (where-is-internal nil t) instead. - -+++ -** The following obsolete (mostly since at least 21.1) functions and aliases -have been removed (the appropriate new function is given in parentheses; -"not needed" means you can just remove all calls to the function in question): -comint-kill-output (comint-delete-output), -decompose-composite-char (char-to-string), -outline-visible (outline-invisible-p), -internal-find-face (facep), internal-get-face (facep and check-face), -frame-update-faces (not needed), -frame-update-face-colors (frame-set-background-mode), -x-frob-font-weight and x-frob-font-slant (appropriate make-face-* function), -x-make-font-bold and x-make-font-demibold (make-face-bold), -x-make-font-italic and x-make-font-oblique (make-face-italic), -x-make-font-bold-italic (make-face-bold-italic), -x-make-font-unbold (make-face-unbold), -x-make-font-unitalic (make-face-unitalic), -mldrag-drag-mode-line (mouse-drag-mode-line), -mldrag-drag-vertical-line (mouse-drag-vertical-line), -iswitchb-default-keybindings (iswitchb-mode), char-bytes (== 1), -isearch-return-char (isearch-printing-char), make-local-hook (not needed), -set-screen-height (set-frame-height), set-screen-width (set-frame-width) - - -+++ -** The following obsolete (mostly since at least 21.1) variables and varaliases -have been removed (the appropriate new variable is given in parentheses): -checkdoc-minor-keymap (checkdoc-minor-mode-map), -vc-header-alist (vc-BACKEND-header), directory-sep-char (== ?/) -font-lock-defaults-alist (font-lock-defaults), and e (float-e). +** The following obsolete functions and aliases have been removed +(the appropriate new function is given in parentheses; "not needed" +means you can just remove all calls to the function in question): + +*** `comint-kill-output' (`comint-delete-output') +*** `decompose-composite-char' (`char-to-string') +*** `outline-visible' (`outline-invisible-p') +*** `internal-find-face' (`facep') +*** `internal-get-face' (`facep and check-face') +*** `frame-update-faces' (not needed) +*** `frame-update-face-colors' (`frame-set-background-mode') +*** `x-frob-font-weight' and `x-frob-font-slant' (`make-face-*' functions) +*** `x-make-font-bold and x-make-font-demibold (make-face-bold) +*** `x-make-font-italic' and `x-make-font-oblique' (`make-face-italic') +*** `x-make-font-bold-italic' (`make-face-bold-italic') +*** `x-make-font-unbold' (`make-face-unbold') +*** `x-make-font-unitalic' (`make-face-unitalic') +*** `mldrag-drag-mode-line' (`mouse-drag-mode-line') +*** `mldrag-drag-vertical-line' (`mouse-drag-vertical-line') +*** `iswitchb-default-keybindings' (`iswitchb-mode') +*** `char-bytes' (== 1) +*** `isearch-return-char' (`isearch-printing-char') +*** `make-local-hook' (not needed) +*** `set-screen-height' (`set-frame-height') +*** `set-screen-width' (`set-frame-width') + ++++ +** The following obsolete variables and varaliases have been removed +(the appropriate new variable is given in parentheses): + +*** `checkdoc-minor-keymap' (`checkdoc-minor-mode-map') +*** `vc-header-alist' (`vc-BACKEND-header') +*** `directory-sep-char' (== ?/) +*** `font-lock-defaults-alist' (`font-lock-defaults') +*** `e' (`float-e'). --- ** The following obsolete files were removed: sc.el, x-menu.el, rnews.el, rnewspost.el --- -** The format of the finder-inf.el file has changed, since the finder -mechanism is now based on the package concept. The variable -finder-package-info is replaced by package--builtins and finder-keywords-hash. +** The format of the finder-inf.el file has changed, since the Finder +mechanism is now based on the package system. The variable +`finder-package-info' is replaced by `package--builtins' and +`finder-keywords-hash'. --- ** When generating autoloads, `update-directory-autoloads' no longer @@ -1205,19 +1201,18 @@ +++ *** New function `current-bidi-paragraph-direction'. -This returns the actual value of base direction of the paragraph at -point. +This returns the base direction of the paragraph at point. +++ *** New function `bidi-string-mark-left-to-right'. Given a string containing characters from right-to-left (RTL) scripts, this function returns another string which can be safely inserted into a buffer, such that any following text will be always displayed to the -right of that string. (This works by appending the Unicode -"LEFT-TO-RIGHT MARK" character when the argument string might need that.) +right of that string. (This works by appending an invisible Unicode +"LEFT-TO-RIGHT MARK" character if the argument string might need it.) -This is useful when the buffer has overall left-to-right (LTR) -paragraph direction and you need to insert a string whose contents and +This is useful when the buffer has overall left-to-right paragraph +direction and you need to insert a string whose contents and directionality are not known in advance, without disrupting the layout of the line. @@ -1320,15 +1315,15 @@ ** Completion -*** New variable completion-extra-properties used to specify extra properties -of the current completion: +*** New variable `completion-extra-properties' used to specify extra +properties of the current completion: - :annotate-function, same as the old completion-annotate-function. - :exit-function, function to call after completion took place. -*** Functions on completion-at-point-functions can return any of the properties -valid for completion-extra-properties. +*** Functions on `completion-at-point-functions' can return any of the +properties valid for `completion-extra-properties'. -*** completion-annotate-function is obsolete. +*** `completion-annotate-function' is obsolete. *** New `metadata' method for completion tables. The metadata thus returned can specify various details of the data returned by `all-completions': @@ -1338,9 +1333,9 @@ - `display-sort-function' to specify how to sort entries in *Completions*. - `cycle-sort-function' to specify how to sort entries when cycling. -*** minibuffer-local-filename-must-match-map is not used any more. -Instead, the bindings in minibuffer-local-filename-completion-map are -combined with minibuffer-local-must-match-map. +*** `minibuffer-local-filename-must-match-map' is not used any more. +Instead, the bindings in `minibuffer-local-filename-completion-map' +are combined with `minibuffer-local-must-match-map'. *** New variable `completing-read-function' allows overriding the behavior of `completing-read'. @@ -1350,14 +1345,7 @@ text terminal display, via a char-table entry that is a cons cell. +++ -** `open-network-stream' can now be used to open an encrypted stream. -It now accepts an optional `:type' parameter for initiating a TLS -connection, directly or via STARTTLS. To do STARTTLS, additional -parameters (`:end-of-command', `:success', `:capabilities-command') -must also be supplied. - -+++ -** pre/post-command-hook are not reset to nil upon error. +** `pre-command-hook'/`post-command-hook' are not reset to nil on error. Instead, the offending function is removed. ** New hook types @@ -1399,8 +1387,8 @@ to redirect STDOUT to a file. +++ -** The function format-time-string now supports the %N directive, for -higher-resolution time stamps. +** The function `format-time-string' now supports the %N directive, +for higher-resolution time stamps. ** New input reading functions +++ @@ -1434,7 +1422,7 @@ *** Syntax tables support a new "comment style c" additionally to style b. +++ -** New hook post-self-insert-hook run at the end of self-insert-command. +** New hook `post-self-insert-hook', run after `self-insert-command'. --- ** frame-local variables cannot be let-bound any more. @@ -1460,14 +1448,16 @@ +++ *** `define-minor-mode' accepts new keywords :variable, :after-hook. +** File-handling changes + +++ -** `delete-file' and `delete-directory' now accept optional arg TRASH. +*** `delete-file' and `delete-directory' now accept optional arg TRASH. Trashing is performed if TRASH and `delete-by-moving-to-trash' are both non-nil. Interactively, TRASH defaults to t, unless a prefix argument is supplied (see Trash changes, above). +++ -** New file predicate functions: file-equal-p, file-in-directory-p. +*** New file predicates: `file-equal-p', `file-in-directory-p'. +++ ** Tool-bars can display separators. @@ -1496,18 +1486,29 @@ +++ *** Image mode can view any image type that ImageMagick supports. This requires Emacs to be built with ImageMagick support. -If your Emacs has ImageMagick support, then the function -`imagemagick-types' is defined, and returns a list of image file -extensions that your installation of ImageMagick supports. The -function `imagemagick-register-types' enables ImageMagick support for -these image types, minus those listed in `imagemagick-types-inhibit'. -Visiting one of these file types will then use Image mode. - ---- -*** New commands to resize and rotate images in Image mode. -These require Emacs to be built with ImageMagick support. -image-transform-fit-to-height, image-transform-fit-to-width, -image-transform-set-rotation, image-transform-set-scale. + +**** New function `imagemagick-types', defined if ImageMagick support +is enabled, returns a list of image file extensions that your +ImageMagick installation supports. + +**** New function `imagemagick-register-types' enables ImageMagick +image types in Image mode and in `create-image' and other helper +functions. + +**** New option `imagemagick-types-inhibit' excludes certain +ImageMagick image types from `imagemagick-register-types'. + +--- +**** With ImageMagick support, there are extra Image mode commands to +resize and rotate images: `image-transform-fit-to-height', +`image-transform-fit-to-width', `image-transform-set-rotation', and +`image-transform-set-scale'. + +--- +** `compose-mail' now accepts an optional 8th arg, RETURN-ACTION, and +passes it to the mail user agent function. This argument specifies an +action for returning to the caller after finishing with the mail. For +example, this is used by Rmail to optionally delete a mail window. +++ ** XML and HTML parsing @@ -1516,16 +1517,29 @@ and `libxml-parse-xml-region' (which parses XML). Both return an Emacs Lisp parse tree. -** GnuTLS - -*** New library `gnutls.el'. -This requires Emacs to have been built with GnuTLS support. -If your Emacs has GnuTLS support, the function gnutls-available-p is -defined and returns non-nil. The main functions are `open-gnutls-stream' -and `gnutls-negotiate'. It's easiest to use these functions through -`open-network-stream' because it can upgrade connections through -STARTTLS opportunistically or use plain SSL, depending on your needs. -For debugging, set `gnutls-log-level' greater than 0. +** Networking and encryption changes + ++++ +*** `open-network-stream' can now be used to open an encrypted stream. +It now accepts an optional `:type' parameter for initiating a TLS +connection, directly or via STARTTLS. To do STARTTLS, additional +parameters (`:end-of-command', `:success', `:capabilities-command') +must also be supplied. + +*** New library gnutls.el. + +If Emacs is built with GnuTLS support, the function +`gnutls-available-p' is defined and returns non-nil. The main entry +points are `open-gnutls-stream' and `gnutls-negotiate'. It's easiest +to use these functions through `open-network-stream', because that can +upgrade connections through STARTTLS opportunistically or use plain +SSL, depending on your needs. For debugging, set `gnutls-log-level' +greater than 0. + ++++ +*** New primitive `secure-hash' that supports many secure hash algorithms: +md5, sha1, sha2, sha224, sha256, sha384, and sha512. The lisp library +sha1.el has been removed. The `sha1' feature is provided by default. ** Isearch @@ -1547,10 +1561,10 @@ --- ** New variables `delayed-warnings-list' and `delayed-warnings-hook'. If delayed-warnings-list is non-nil, the command loop calls -delayed-warnings-hook after post-command-hook. At present, this is -only used by Emacs on some platforms to display warnings during -startup, which might otherwise not be noticed. This uses the functions -display-delayed-warnings and collapse-delayed-warnings. +`delayed-warnings-hook' after `post-command-hook'. At present, this +is only used by Emacs on some platforms to display warnings during +startup, which might otherwise not be noticed. This uses the +functions `display-delayed-warnings' and `collapse-delayed-warnings'. --- ** rx.el has a new `group-n' construct for explicitly numbered groups. @@ -1574,7 +1588,7 @@ +++ ** New math functions `isnan', `copysign', `frexp', `ldexp'. -** Obsolete functions and variables +** The following functions and variables are obsolete: --- *** `tooltip-use-echo-area' is obsolete. ------------------------------------------------------------ revno: 107741 committer: Michael Albinus branch nick: trunk timestamp: Tue 2012-04-03 10:18:10 +0200 message: Change doc flag for notifications.el and soap-client.el diff: === modified file 'etc/NEWS' --- etc/NEWS 2012-04-02 09:59:52 +0000 +++ etc/NEWS 2012-04-03 08:18:10 +0000 @@ -720,7 +720,7 @@ *** It is now possible to access buses other than the default system or session bus. -*** The dbus-register-method and dbus-register-property functions +*** The dbus-register-method and dbus-register-property functions optionally do not register names. *** The new function dbus-register-service registers a known service name @@ -1025,9 +1025,11 @@ `secrets-show-secrets' offers a buffer with a visualization of the secrets. ++++ ** notifications.el provides an implementation of the Desktop Notifications API. It requires D-Bus for communication. +--- ** soap-client.el supports access to SOAP web services from Emacs. soap-inspect.el is an interactive inspector for SOAP WSDL structures. ------------------------------------------------------------ revno: 107740 committer: Michael Albinus branch nick: trunk timestamp: Tue 2012-04-03 10:10:17 +0200 message: * os.texi (Terminal-Specific): Fix typo. (Notifications): New section. * elisp.texi (Top): * vol1.texi (Top): * vol2.texi (Top): Add "Notifications" and "Dynamic Libraries" menu entries. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-04-01 02:44:24 +0000 +++ doc/lispref/ChangeLog 2012-04-03 08:10:17 +0000 @@ -1,3 +1,13 @@ +2012-04-03 Michael Albinus + + * os.texi (Terminal-Specific): Fix typo. + (Notifications): New section. + + * elisp.texi (Top): + * vol1.texi (Top): + * vol2.texi (Top): Add "Notifications" and "Dynamic Libraries" + menu entries. + 2012-04-01 Chong Yidong * files.texi (Kinds of Files): file-subdir-of-p renamed to === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2012-03-25 07:58:59 +0000 +++ doc/lispref/elisp.texi 2012-04-03 08:10:17 +0000 @@ -1390,6 +1390,8 @@ * Batch Mode:: Running Emacs without terminal interaction. * Session Management:: Saving and restoring state with X Session Management. +* Notifications:: Desktop notifications. +* Dynamic Libraries:: On-demand loading of support libraries. Preparing Lisp code for distribution === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2012-03-27 00:49:32 +0000 +++ doc/lispref/os.texi 2012-04-03 08:10:17 +0000 @@ -35,6 +35,7 @@ * X11 Keysyms:: Operating on key symbols for X Windows. * Batch Mode:: Running Emacs without terminal interaction. * Session Management:: Saving and restoring state with X Session Management. +* Notifications:: Desktop notifications. * Dynamic Libraries:: On-demand loading of support libraries. @end menu @@ -273,7 +274,7 @@ @ignore @c I do not think this should be mentioned. AFAICS it is just a dodge @c around inhibit-startup-screen not being settable on a site-wide basis. -If its value is @code{t}, Emacs displays the @samp{*scratch*} buffer. +If its value is @code{t}, Emacs displays the @samp{*scratch*} buffer. @end ignore @end defopt @@ -461,7 +462,7 @@ You can also arrange to override some of the actions of the terminal-specific library by setting the variable @code{term-setup-hook}. This is a normal hook that Emacs runs -at the end its initialization, after loading both +at the end of its initialization, after loading both your init file and any terminal-specific libraries. You could use this hook to define initializations for terminals that do not have their own libraries. @xref{Hooks}. @@ -2249,6 +2250,151 @@ @end group @end example +@node Notifications +@section Desktop Notifications +@cindex desktop notifications + +Emacs is able to send notifications on systems which support the +desktop notification specification of freedesktop.org. In order to +use this functionality, the package @code{notifications} must be loaded. + +@defun notifications-notify &rest params +This function sends a notification to the desktop via D-Bus. +Various @var{params} can be set, none of them is mandatory: + +@table @code +@item :title @var{title} +The notification title. + +@item :body @var{text} +The notification body text. Depending on the implementation of the +notification server, the text could contain HTML markups, like +@samp{"bold text"}, or hyperlinks. + +@item :app-name @var{name} +The name of the application sending the notification. Default is +@code{notifications-application-name}. + +@item :replaces-id @var{id} +The notification @var{id} that this notification replaces. @var{id} +must be the result of a previous @code{notifications-notify} call. + +@item :app-icon @var{icon-file} +The file name of the notification icon. If set to @code{nil}, no icon +is displayed. Default is @code{notifications-application-icon}. + +@item :actions (@var{key} @var{title} @var{key} @var{title} ...) +A list of actions to be applied. @var{key} and @var{title} are both +strings. The default action (usually invoked by clicking the +notification) should have a key named @samp{"default"}. The title can +be anything, though implementations are free not to display it. + +@item :timeout @var{timeout} +The timeout time in milliseconds since the display of the notification +at which the notification should automatically close. If -1, the +notification's expiration time is dependent on the notification +server's settings, and may vary for the type of notification. If 0, +the notification never expires. Default value is -1. + +@item :urgency @var{urgency} +The urgency level. It can be @code{low}, @code{normal} or @code{critical}. + +@item :category @var{category} +The type of notification this is, a string. + +@item :desktop-entry @var{filename} +This specifies the name of the desktop filename representing the +calling program, like @samp{"emacs"}. + +@item :image-data (@var{width} @var{height} @var{rowstride} @var{has-alpha} @var{bits} @var{channels} @var{data}) +This is a raw data image format which describes the width, height, +rowstride, has alpha, bits per sample, channels and image data +respectively. + +@item :image-path @var{path} +This is represented either as a URI (@samp{file://} is the only URI +schema supported right now) or a name in a freedesktop.org-compliant +icon theme from @samp{$XDG_DATA_DIRS/icons}, like @samp{"mail-message-new"}. + +@item :sound-file @var{filename} +The path to a sound file to play when the notification pops up. + +@item :sound-name @var{name} +A themable named sound from the freedesktop.org sound naming +specification from @samp{$XDG_DATA_DIRS/sounds}, to play when the +notification pops up. Similar to the icon name, only for sounds. An +example would be @samp{"message-new-instant"}. + +@item :suppress-sound +Causes the server to suppress playing any sounds, if it has that +ability. + +@item :x @var{position} +@itemx :y @var{position} +Specifies the X respectively Y location on the screen that the +notification should point to. Both arguments must be used together. + +@item :on-action @var{function} +Function to call when an action is invoked. The notification @var{id} +and the @var{key} of the action are passed as arguments to the +function. + +@item :on-close @var{function} +Function to call when the notification has been closed by timeout or +by the user. The function receive the notification @var{id} and the closing +@var{reason} as arguments: + +@itemize +@item @code{expired} if the notification has expired +@item @code{dismissed} if the notification was dismissed by the user +@item @code{close-notification} if the notification was closed by a call to +@code{notifications-close-notification} +@item @code{undefined} if the notification server hasn't provided a reason +@end itemize +@end table + +This function returns a notification id, an integer, which can be used +to manipulate the notification item with +@code{notifications-close-notification} or the @code{:replaces-id} +argument of another @code{notifications-notify} call. + +Example: + +@example +@group +(defun my-on-action-function (id key) + (message "Message %d, key \"%s\" pressed" id key)) + @result{} my-on-action-function +@end group + +@group +(defun my-on-close-function (id reason) + (message "Message %d, closed due to \"%s\"" id reason)) + @result{} my-on-close-function +@end group + +@group +(notifications-notify + :title "Title" + :body "This is important." + :actions '("Confirm" "I agree" "Refuse" "I disagree") + :on-action 'my-on-action-function + :on-close 'my-on-close-function) + @result{} 22 +@end group + +@group +A message window opens on the desktop. Press "I agree" + @result{} Message 22, key "Confirm" pressed + Message 22, closed due to "dismissed" +@end group +@end example +@end defun + +@defun notifications-close-notification id +This function closes a notification with identifier ID. +@end defun + @node Dynamic Libraries @section Dynamically Loaded Libraries @cindex dynamic libraries === modified file 'doc/lispref/vol1.texi' --- doc/lispref/vol1.texi 2012-03-25 07:58:59 +0000 +++ doc/lispref/vol1.texi 2012-04-03 08:10:17 +0000 @@ -1412,6 +1412,8 @@ * Batch Mode:: Running Emacs without terminal interaction. * Session Management:: Saving and restoring state with X Session Management. +* Notifications:: Desktop notifications. +* Dynamic Libraries:: On-demand loading of support libraries. Preparing Lisp code for distribution === modified file 'doc/lispref/vol2.texi' --- doc/lispref/vol2.texi 2012-03-25 07:58:59 +0000 +++ doc/lispref/vol2.texi 2012-04-03 08:10:17 +0000 @@ -1411,6 +1411,8 @@ * Batch Mode:: Running Emacs without terminal interaction. * Session Management:: Saving and restoring state with X Session Management. +* Notifications:: Desktop notifications. +* Dynamic Libraries:: On-demand loading of support libraries. Preparing Lisp code for distribution ------------------------------------------------------------ revno: 107739 committer: Michael Albinus branch nick: trunk timestamp: Tue 2012-04-03 09:20:32 +0200 message: * notifications.el (notifications-notify): Fix docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-02 16:32:06 +0000 +++ lisp/ChangeLog 2012-04-03 07:20:32 +0000 @@ -1,3 +1,7 @@ +2012-04-03 Michael Albinus + + * notifications.el (notifications-notify): Fix docstring. + 2012-04-02 Glenn Morris * emacs-lisp/authors.el (authors-aliases): Another addition. === modified file 'lisp/notifications.el' --- lisp/notifications.el 2012-03-07 07:48:16 +0000 +++ lisp/notifications.el 2012-04-03 07:20:32 +0000 @@ -185,10 +185,13 @@ - `dismissed' if the notification was dismissed by the user - `close-notification' if the notification was closed by a call to CloseNotification + - `undefined' if the notification server hasn't provided + a reason This function returns a notification id, an integer, which can be used to manipulate the notification item with -`notifications-close-notification'." +`notifications-close-notification' or the `:replaces-id' argument +of another `notifications-notify' call." (let ((title (plist-get params :title)) (body (plist-get params :body)) (app-name (plist-get params :app-name)) ------------------------------------------------------------ revno: 107738 fixes bug(s): http://debbugs.gnu.org/11091 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2012-04-02 20:33:41 +0300 message: Add details about emacsclient -c and -t on MS-Windows. doc/emacs/msdog.texi (Windows Startup): Add description of emacsclient operation under -c and -t on MS-Windows. doc/emacs/misc.texi (emacsclient Options): Add cross-reference to "Windows Startup". diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-04-02 04:18:06 +0000 +++ doc/emacs/ChangeLog 2012-04-02 17:33:41 +0000 @@ -1,3 +1,11 @@ +2012-04-02 Eli Zaretskii + + * msdog.texi (Windows Startup): Add description of emacsclient + operation under -c and -t on MS-Windows. + + * misc.texi (emacsclient Options): Add cross-reference to "Windows + Startup". (Bug#11091) + 2012-04-02 Dani Moncayo (tiny change) * custom.texi (Changing a Variable): Fix example. === modified file 'doc/emacs/misc.texi' --- doc/emacs/misc.texi 2012-04-01 20:47:58 +0000 +++ doc/emacs/misc.texi 2012-04-02 17:33:41 +0000 @@ -1507,12 +1507,11 @@ frame. Emacs can create a graphical frame even if it was started in a text-only terminal, provided it is able to connect to a graphical display. If Emacs is unable to connect to a graphical display, and on -systems, such as MS-Windows, where it cannot create graphical frames -when started from a text-only terminal, it creates a new text-only -terminal frame (@pxref{Frames}) on the same terminal where it was -started. If you omit a filename argument while supplying the -@samp{-c} option, the new frame displays the @samp{*scratch*} buffer -(@pxref{Buffers}). +systems, such as MS-Windows (@pxref{Windows Startup, emacsclient}), +where it cannot create graphical frames when started from a text-only +terminal, it creates a new text-only terminal frame (@pxref{Frames}). +If you omit a filename argument while supplying the @samp{-c} option, +the new frame displays the @samp{*scratch*} buffer (@pxref{Buffers}). @item -F @var{alist} @itemx --frame-parameters=@var{alist} @@ -1599,9 +1598,10 @@ even if it was started in another text-only terminal, or on a graphical display. On systems, such as MS-Windows, where this is impossible, Emacs will create a new frame, either GUI or text-only, on -the same terminal where it was started. If you omit a filename -argument while supplying this option, the new frame displays the -@samp{*scratch*} buffer. @xref{Buffers}. +the same terminal where it was started (@pxref{Windows Startup, +emacsclient}). If you omit a filename argument while supplying this +option, the new frame displays the @samp{*scratch*} buffer. +@xref{Buffers}. @end table If you type @kbd{C-x C-c} (@code{save-buffers-kill-terminal}) in an === modified file 'doc/emacs/msdog.texi' --- doc/emacs/msdog.texi 2012-02-28 08:17:21 +0000 +++ doc/emacs/msdog.texi 2012-04-02 17:33:41 +0000 @@ -109,6 +109,21 @@ the program that invoked @command{emacsclient}. @end enumerate +@cindex emacsclient, on MS-Windows +Note that, due to limitations of MS-Windows, Emacs cannot have both +GUI and text-mode frames in the same session. It also cannot open +text-mode frames on more than a single @dfn{Command Prompt} window, +because each Windows program can have only one console at any given +time. For these reasons, if you invoke @command{emacsclient} with the +@option{-c} option, and the Emacs server runs in a text-mode session, +Emacs will always create a new text-mode frame in the same +@dfn{Command Prompt} window where it was started; a GUI frame will be +created only if the server runs in a GUI session. Similarly, if you +invoke @command{emacsclient} with the @option{-t} option, Emacs will +create a GUI frame if the server runs in a GUI session, or a text-mode +frame when the session runs in text-only mode in a @dfn{Command +Prompt} window. @xref{emacsclient Options}. + @node Text and Binary @section Text Files and Binary Files @cindex text and binary files on MS-DOS/MS-Windows