Now on revision 106778. ------------------------------------------------------------ revno: 106778 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-01-04 23:51:27 -0800 message: Typo fix. diff: === modified file 'etc/org/README' --- etc/org/README 2012-01-04 14:14:29 +0000 +++ etc/org/README 2012-01-05 07:51:27 +0000 @@ -3,7 +3,7 @@ Copyright (C) 2010-2012 Free Software Foundation, Inc. -These file are part of GNU Emacs. +These files are part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by ------------------------------------------------------------ revno: 106777 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-01-04 23:49:56 -0800 message: ChangeLog fixes. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-01-05 07:45:28 +0000 +++ etc/ChangeLog 2012-01-05 07:49:56 +0000 @@ -12,14 +12,18 @@ * refcards/vipcard.tex, refcards/viperCard.tex: Update short copyright year to 2012. +2012-01-04 Chong Yidong + + * org/README: Rename from COPYRIGHT-AND-LICENSE. + +2012-01-03 Jambunathan K + + * org/OrgOdtContentTemplate.xml, org/OrgOdtStyles.xml: New files. + 2012-01-03 Bastien Guerry * org/COPYRIGHT-AND-LICENSE: New file. - * org/OrgOdtContentTemplate.xml: New file. - - * org/OrgOdtStyles.xml: New file. - * org/: New directory. 2012-01-03 Julian Gehring ------------------------------------------------------------ revno: 106776 committer: Glenn Morris branch nick: trunk timestamp: Wed 2012-01-04 23:45:28 -0800 message: Update short copyright year to 2012. * etc/refcards/calccard.tex, etc/refcards/cs-dired-ref.tex: * etc/refcards/cs-refcard.tex, etc/refcards/cs-survival.tex: * etc/refcards/de-refcard.tex, etc/refcards/dired-ref.tex: * etc/refcards/fr-dired-ref.tex, etc/refcards/fr-refcard.tex: * etc/refcards/fr-survival.tex, etc/refcards/orgcard.tex: * etc/refcards/pl-refcard.tex, etc/refcards/pt-br-refcard.tex: * etc/refcards/refcard.tex, etc/refcards/ru-refcard.tex: * etc/refcards/sk-dired-ref.tex, etc/refcards/sk-refcard.tex: * etc/refcards/sk-survival.tex, etc/refcards/survival.tex: * etc/refcards/vipcard.tex, etc/refcards/viperCard.tex: * lib-src/ebrowse.c (version) : * lib-src/etags.c (print_version) : * lib-src/rcs2log (Copyright): Update short copyright year to 2012. * nextstep/Cocoa/Emacs.base/Contents/Info.plist: * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: * src/emacs.c (emacs_copyright): Update short copyright year to 2012. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2012-01-03 17:27:21 +0000 +++ etc/ChangeLog 2012-01-05 07:45:28 +0000 @@ -1,3 +1,17 @@ +2012-01-05 Glenn Morris + + * refcards/calccard.tex, refcards/cs-dired-ref.tex: + * refcards/cs-refcard.tex, refcards/cs-survival.tex: + * refcards/de-refcard.tex, refcards/dired-ref.tex: + * refcards/fr-dired-ref.tex, refcards/fr-refcard.tex: + * refcards/fr-survival.tex, refcards/orgcard.tex: + * refcards/pl-refcard.tex, refcards/pt-br-refcard.tex: + * refcards/refcard.tex, refcards/ru-refcard.tex: + * refcards/sk-dired-ref.tex, refcards/sk-refcard.tex: + * refcards/sk-survival.tex, refcards/survival.tex: + * refcards/vipcard.tex, refcards/viperCard.tex: + Update short copyright year to 2012. + 2012-01-03 Bastien Guerry * org/COPYRIGHT-AND-LICENSE: New file. === modified file 'etc/refcards/calccard.tex' --- etc/refcards/calccard.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/calccard.tex 2012-01-05 07:45:28 +0000 @@ -64,7 +64,7 @@ % Internet: gildea@stop.mail-abuse.org \def\emacsversionnumber{23} -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. === modified file 'etc/refcards/cs-dired-ref.tex' --- etc/refcards/cs-dired-ref.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/cs-dired-ref.tex 2012-01-05 07:45:28 +0000 @@ -42,7 +42,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. === modified file 'etc/refcards/cs-refcard.tex' --- etc/refcards/cs-refcard.tex 2011-01-26 08:36:39 +0000 +++ etc/refcards/cs-refcard.tex 2012-01-05 07:45:28 +0000 @@ -60,7 +60,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. === modified file 'etc/refcards/cs-survival.tex' --- etc/refcards/cs-survival.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/cs-survival.tex 2012-01-05 07:45:28 +0000 @@ -55,7 +55,7 @@ \chyph \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter === modified file 'etc/refcards/de-refcard.tex' --- etc/refcards/de-refcard.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/de-refcard.tex 2012-01-05 07:45:28 +0000 @@ -61,7 +61,7 @@ \mdqoff % deactivates the "-char \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. === modified file 'etc/refcards/dired-ref.tex' --- etc/refcards/dired-ref.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/dired-ref.tex 2012-01-05 07:45:28 +0000 @@ -44,7 +44,7 @@ \pdflayout=(1) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. === modified file 'etc/refcards/fr-dired-ref.tex' --- etc/refcards/fr-dired-ref.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/fr-dired-ref.tex 2012-01-05 07:45:28 +0000 @@ -36,7 +36,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. === modified file 'etc/refcards/fr-refcard.tex' --- etc/refcards/fr-refcard.tex 2011-01-26 08:36:39 +0000 +++ etc/refcards/fr-refcard.tex 2012-01-05 07:45:28 +0000 @@ -57,7 +57,7 @@ \pdflayout=(0l) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. === modified file 'etc/refcards/fr-survival.tex' --- etc/refcards/fr-survival.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/fr-survival.tex 2012-01-05 07:45:28 +0000 @@ -50,7 +50,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter === modified file 'etc/refcards/orgcard.tex' --- etc/refcards/orgcard.tex 2012-01-03 17:27:21 +0000 +++ etc/refcards/orgcard.tex 2012-01-05 07:45:28 +0000 @@ -1,7 +1,7 @@ % Reference Card for Org Mode \def\orgversionnumber{7.8.02} \def\versionyear{2011} % latest update -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year %**start of header \newcount\columnsperpage === modified file 'etc/refcards/pl-refcard.tex' --- etc/refcards/pl-refcard.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/pl-refcard.tex 2012-01-05 07:45:28 +0000 @@ -70,7 +70,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. === modified file 'etc/refcards/pt-br-refcard.tex' --- etc/refcards/pt-br-refcard.tex 2011-01-26 08:36:39 +0000 +++ etc/refcards/pt-br-refcard.tex 2012-01-05 07:45:28 +0000 @@ -63,7 +63,7 @@ \pdflayout=(0l) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed below this line. === modified file 'etc/refcards/refcard.tex' --- etc/refcards/refcard.tex 2011-08-24 07:31:35 +0000 +++ etc/refcards/refcard.tex 2012-01-05 07:45:28 +0000 @@ -64,7 +64,7 @@ % Nothing else needs to be changed below this line. \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % copyright year +\def\year{2012} % copyright year \def\shortcopyrightnotice{\vskip 1ex plus 2 fill \centerline{\small \copyright\ \year\ Free Software Foundation, Inc. === modified file 'etc/refcards/ru-refcard.tex' --- etc/refcards/ru-refcard.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/ru-refcard.tex 2012-01-05 07:45:28 +0000 @@ -22,7 +22,7 @@ \setlength{\ColThreeWidth}{25mm} \newcommand{\versionemacs}[0]{23} % version of Emacs this is for -\newcommand{\cyear}[0]{2011} % copyright year +\newcommand{\cyear}[0]{2012} % copyright year \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill \centerline{\footnotesize \copyright\ \cyear\ Free Software Foundation, Inc. === modified file 'etc/refcards/sk-dired-ref.tex' --- etc/refcards/sk-dired-ref.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/sk-dired-ref.tex 2012-01-05 07:45:28 +0000 @@ -43,7 +43,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. === modified file 'etc/refcards/sk-refcard.tex' --- etc/refcards/sk-refcard.tex 2011-01-26 08:36:39 +0000 +++ etc/refcards/sk-refcard.tex 2012-01-05 07:45:28 +0000 @@ -61,7 +61,7 @@ \pdflayout=(0) \def\versionemacs{23} % version of Emacs this is for -\def\year{2010} % latest copyright year +\def\year{2012} % latest copyright year % Nothing else needs to be changed. === modified file 'etc/refcards/sk-survival.tex' --- etc/refcards/sk-survival.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/sk-survival.tex 2012-01-05 07:45:28 +0000 @@ -56,7 +56,7 @@ \shyph \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter === modified file 'etc/refcards/survival.tex' --- etc/refcards/survival.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/survival.tex 2012-01-05 07:45:28 +0000 @@ -45,7 +45,7 @@ \pdflayout=(1) \def\versionemacs{23} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\copyrightnotice{\penalty-1\vfill \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter === modified file 'etc/refcards/vipcard.tex' --- etc/refcards/vipcard.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/vipcard.tex 2012-01-05 07:45:28 +0000 @@ -50,7 +50,7 @@ \pdflayout=(1) \def\versionemacs{18} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\versionvip{3.5} % Nothing else needs to be changed. === modified file 'etc/refcards/viperCard.tex' --- etc/refcards/viperCard.tex 2011-01-25 04:08:28 +0000 +++ etc/refcards/viperCard.tex 2012-01-05 07:45:28 +0000 @@ -53,7 +53,7 @@ \pdflayout=(1) \def\versionemacs{21} % version of Emacs this is for -\def\year{2011} % latest copyright year +\def\year{2012} % latest copyright year \def\versionxemacs{20} % version of XEmacs this is for \def\versionviper{3.0} % version of Viper this is for === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-12-25 09:55:37 +0000 +++ lib-src/ChangeLog 2012-01-05 07:45:28 +0000 @@ -1,3 +1,9 @@ +2012-01-05 Glenn Morris + + * ebrowse.c (version) : + * etags.c (print_version) : + * rcs2log (Copyright): Update short copyright year to 2012. + 2011-12-25 Andreas Schwab * etags.c (C_entries): Properly skip over string and character === modified file 'lib-src/ebrowse.c' --- lib-src/ebrowse.c 2011-12-30 02:52:49 +0000 +++ lib-src/ebrowse.c 2012-01-05 07:45:28 +0000 @@ -3526,7 +3526,7 @@ version (void) { /* Makes it easier to update automatically. */ - char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; + char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; printf ("ebrowse %s\n", VERSION); puts (emacs_copyright); === modified file 'lib-src/etags.c' --- lib-src/etags.c 2011-12-25 09:55:37 +0000 +++ lib-src/etags.c 2012-01-05 07:45:28 +0000 @@ -867,7 +867,7 @@ print_version (void) { /* Makes it easier to update automatically. */ - char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; + char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION); puts (emacs_copyright); === modified file 'lib-src/rcs2log' --- lib-src/rcs2log 2011-01-25 04:08:28 +0000 +++ lib-src/rcs2log 2012-01-05 07:45:28 +0000 @@ -20,7 +20,7 @@ # along with this program. If not, see . -Copyright='Copyright (C) 2011 Free Software Foundation, Inc. +Copyright='Copyright (C) 2012 Free Software Foundation, Inc. This program comes with NO WARRANTY, to the extent permitted by law. You may redistribute copies of this program under the terms of the GNU General Public License. === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2011-10-19 15:42:29 +0000 +++ nextstep/ChangeLog 2012-01-05 07:45:28 +0000 @@ -1,3 +1,10 @@ +2012-01-05 Glenn Morris + + * Cocoa/Emacs.base/Contents/Info.plist: + * Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: + * GNUstep/Emacs.base/Resources/Info-gnustep.plist: + Update short copyright year to 2012. + 2011-10-19 Jan Djärv * INSTALL: Remove XCode part. === modified file 'nextstep/Cocoa/Emacs.base/Contents/Info.plist' --- nextstep/Cocoa/Emacs.base/Contents/Info.plist 2011-11-30 16:23:05 +0000 +++ nextstep/Cocoa/Emacs.base/Contents/Info.plist 2012-01-05 07:45:28 +0000 @@ -553,7 +553,7 @@ CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 24.0.92 Copyright (C) 2011 Free Software Foundation, Inc. + Emacs 24.0.92 Copyright (C) 2012 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier === modified file 'nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings' --- nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings 2011-11-30 16:23:05 +0000 +++ nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings 2012-01-05 07:45:28 +0000 @@ -3,4 +3,4 @@ CFBundleName = "Emacs"; CFBundleShortVersionString = "Version 24.0.92"; CFBundleGetInfoString = "Emacs version 24.0.92, NS Windowing"; -NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; +NSHumanReadableCopyright = "Copyright (C) 2012 Free Software Foundation, Inc."; === modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist' --- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-11-30 16:23:05 +0000 +++ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2012-01-05 07:45:28 +0000 @@ -11,7 +11,7 @@ "Carl Edman (NeXTstep)", "..see etc/NEXTSTEP" ); - Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; + Copyright = "Copyright (C) 2012 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; FullVersionID = "Emacs 24.0.92, NS Windowing"; NSExecutable = Emacs; === modified file 'src/ChangeLog' --- src/ChangeLog 2012-01-03 02:14:40 +0000 +++ src/ChangeLog 2012-01-05 07:45:28 +0000 @@ -1,3 +1,7 @@ +2012-01-05 Glenn Morris + + * emacs.c (emacs_copyright): Update short copyright year to 2012. + 2012-01-01 Eli Zaretskii * gnutls.c (init_gnutls_functions): Load gnutls_check_version. === modified file 'src/emacs.c' --- src/emacs.c 2011-12-21 08:04:19 +0000 +++ src/emacs.c 2012-01-05 07:45:28 +0000 @@ -98,7 +98,7 @@ #endif static const char emacs_version[] = VERSION; -static const char emacs_copyright[] = "Copyright (C) 2011 Free Software Foundation, Inc."; +static const char emacs_copyright[] = "Copyright (C) 2012 Free Software Foundation, Inc."; /* Make these values available in GDB, which doesn't see macros. */ ------------------------------------------------------------ revno: 106775 committer: Michael Mauger branch nick: trunk timestamp: Wed 2012-01-04 22:45:30 -0500 message: 2012-01-05 Michael R. Mauger * progmodes/sql.el (sql-login-hook): Add hook to respond to the first prompt in `sql-interacive-mode'. (sql-mode-oracle-font-lock-keywords): Add CONNECT_BY_* builtin keywords. (sql-mode-mysql-font-lock-keywords): Add ELSEIF keyword. (sql-product-interactive): Bug fix: Set `sql-buffer' in context of original buffer. Invoke `sql-login-hook'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-04 18:51:47 +0000 +++ lisp/ChangeLog 2012-01-05 03:45:30 +0000 @@ -1,3 +1,13 @@ +2012-01-05 Michael R. Mauger + + * progmodes/sql.el (sql-login-hook): Add hook to respond to the + first prompt in `sql-interacive-mode'. + (sql-mode-oracle-font-lock-keywords): Add CONNECT_BY_* builtin + keywords. + (sql-mode-mysql-font-lock-keywords): Add ELSEIF keyword. + (sql-product-interactive): Bug fix: Set `sql-buffer' in + context of original buffer. Invoke `sql-login-hook'. + 2012-01-04 Eli Zaretskii * mail/rmail.el (rmail-font-lock-keywords): Accept non-ASCII === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2011-12-19 06:21:24 +0000 +++ lisp/progmodes/sql.el 2012-01-05 03:45:30 +0000 @@ -1,6 +1,6 @@ ;;; sql.el --- specialized comint.el for SQL interpreters -;; Copyright (C) 1998-2011 Free Software Foundation, Inc. +;; Copyright (C) 1998-2012 Free Software Foundation, Inc. ;; Author: Alex Schroeder ;; Maintainer: Michael Mauger @@ -219,6 +219,8 @@ ;; Drew Adams -- Emacs 20 support ;; Harald Maier -- sql-send-string ;; Stefan Monnier -- font-lock corrections; code polish +;; Paul Sleigh -- MySQL keyword enhancement +;; Andrew Schein -- sql-port bug @@ -811,6 +813,14 @@ :type 'hook :group 'SQL) +(defcustom sql-login-hook '() + "Hook for interacting with a buffer in `sql-interactive-mode'. + +This hook is invoked in a buffer once it is ready to accept input +for the first time." + :type 'hook + :group 'SQL) + ;; Customization for ANSI (defcustom sql-ansi-statement-starters (regexp-opt '( @@ -1594,6 +1604,7 @@ "atan" "atan2" "avg" "bfilename" "bin_to_num" "bitand" "cardinality" "cast" "ceil" "chartorowid" "chr" "cluster_id" "cluster_probability" "cluster_set" "coalesce" "collect" "compose" "concat" "convert" "corr" +"connect_by_root" "connect_by_iscycle" "connect_by_isleaf" "corr_k" "corr_s" "cos" "cosh" "count" "covar_pop" "covar_samp" "cube_table" "cume_dist" "current_date" "current_timestamp" "cv" "dataobj_to_partition" "dbtimezone" "decode" "decompose" "deletexml" @@ -2279,7 +2290,7 @@ "collation" "column" "columns" "comment" "committed" "concurrent" "constraint" "create" "cross" "data" "database" "default" "delay_key_write" "delayed" "delete" "desc" "directory" "disable" -"distinct" "distinctrow" "do" "drop" "dumpfile" "duplicate" "else" +"distinct" "distinctrow" "do" "drop" "dumpfile" "duplicate" "else" "elseif" "enable" "enclosed" "end" "escaped" "exists" "fields" "first" "for" "force" "foreign" "from" "full" "fulltext" "global" "group" "handler" "having" "heap" "high_priority" "if" "ignore" "in" "index" "infile" @@ -3423,7 +3434,7 @@ :prompt-regexp)) (start nil)) (with-current-buffer buf - (toggle-read-only -1) + (setq view-read-only nil) (unless save-prior (erase-buffer)) (goto-char (point-max)) @@ -3532,7 +3543,7 @@ (get-lru-window)))) (with-current-buffer outbuf (set-buffer-modified-p nil) - (toggle-read-only 1)) + (setq view-read-only t)) (view-buffer-other-window outbuf) (when one-win (shrink-window-if-larger-than-buffer))))) @@ -4097,7 +4108,8 @@ (setq new-sqli-buffer (current-buffer)) (when new-name (sql-rename-buffer new-name)) - (setq sql-buffer (buffer-name new-sqli-buffer)) + (set (make-local-variable 'sql-buffer) + (buffer-name new-sqli-buffer)) ;; Set `sql-buffer' in the start buffer (with-current-buffer start-buffer @@ -4107,6 +4119,7 @@ ;; All done. (message "Login...done") + (run-hooks 'sql-login-hook) (pop-to-buffer new-sqli-buffer))))) (message "No default SQL product defined. Set `sql-product'."))) ------------------------------------------------------------ revno: 106774 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2012-01-04 22:14:09 +0000 message: Merge changes made in Gnus trunk. 2012-01-04 Lars Magne Ingebrigtsen * gnus.texi (Group Parameters): Note precedence. 2012-01-04 Chris Gray (tiny change) * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a live buffer. 2012-01-04 Lars Magne Ingebrigtsen * nnir.el (nnir-retrieve-headers): Protect against the article not existing on the server (bug#10335). 2012-01-04 Wolfgang Jenkner (tiny change) * gnus-agent.el (gnus-agent-load-local): Recompute gnus-agent-article-local on changing method. 2012-01-04 Lars Magne Ingebrigtsen * gnus.el (gnus-parameters): Note precedence. 2012-01-04 Leo * nndraft.el (nndraft-update-unread-articles): Don't move point around in the group buffer. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-01-03 17:27:21 +0000 +++ doc/misc/ChangeLog 2012-01-04 22:14:09 +0000 @@ -1,3 +1,7 @@ +2012-01-04 Lars Magne Ingebrigtsen + + * gnus.texi (Group Parameters): Note precedence. + 2012-01-03 Eric Schulte * org.texi (Noweb reference syntax): Adding documentation of === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-12-31 01:27:15 +0000 +++ doc/misc/gnus.texi 2012-01-04 22:14:09 +0000 @@ -3187,8 +3187,10 @@ (broken-reply-to . t)))) @end lisp -String value of parameters will be subjected to regexp substitution, as -the @code{to-group} example shows. +The first clause that matches the group name will be used. + +Parameters that are strings will be subjected to regexp substitution, +as the @code{to-group} example shows. @vindex gnus-parameters-case-fold-search By default, whether comparing the group name and one of those regexps === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-01-04 10:49:38 +0000 +++ lisp/gnus/ChangeLog 2012-01-04 22:14:09 +0000 @@ -1,3 +1,27 @@ +2012-01-04 Chris Gray (tiny change) + + * mm-decode.el (mm-shr): Check that `gnus-summary-buffer' really is a + live buffer. + +2012-01-04 Lars Magne Ingebrigtsen + + * nnir.el (nnir-retrieve-headers): Protect against the article not + existing on the server (bug#10335). + +2012-01-04 Wolfgang Jenkner (tiny change) + + * gnus-agent.el (gnus-agent-load-local): Recompute + gnus-agent-article-local on changing method. + +2012-01-04 Lars Magne Ingebrigtsen + + * gnus.el (gnus-parameters): Note precedence. + +2012-01-04 Leo + + * nndraft.el (nndraft-update-unread-articles): Don't move point around + in the group buffer. + 2012-01-04 Julien Danjou * nnimap.el (nnimap-update-info): Fix an error when all articles UIDs === modified file 'lisp/gnus/gnus-agent.el' --- lisp/gnus/gnus-agent.el 2011-12-30 02:52:49 +0000 +++ lisp/gnus/gnus-agent.el 2012-01-04 22:14:09 +0000 @@ -2229,7 +2229,10 @@ article counts for each of the method's subscribed groups." (let ((gnus-command-method (or method gnus-command-method))) (when (or (null gnus-agent-article-local-times) - (zerop gnus-agent-article-local-times)) + (zerop gnus-agent-article-local-times) + (not (gnus-methods-equal-p + gnus-command-method + (symbol-value (intern "+method" gnus-agent-article-local))))) (setq gnus-agent-article-local (gnus-cache-file-contents (gnus-agent-lib-file "local") === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2011-12-04 08:02:42 +0000 +++ lisp/gnus/gnus.el 2012-01-04 22:14:09 +0000 @@ -1,6 +1,6 @@ ;;; gnus.el --- a newsreader for GNU Emacs -;; Copyright (C) 1987-1990, 1993-1998, 2000-2011 +;; Copyright (C) 1987-1990, 1993-1998, 2000-2012 ;; Free Software Foundation, Inc. ;; Author: Masanobu UMEDA @@ -1146,7 +1146,9 @@ (display . all)) (\"mail\\\\.me\" (gnus-use-scoring t)) (\"list\\\\..*\" (total-expire . t) - (broken-reply-to . t)))" + (broken-reply-to . t))) + +The first clause that matches the group name will be used." :version "22.1" :group 'gnus-group-various :type '(repeat (cons regexp === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2011-12-15 23:35:40 +0000 +++ lisp/gnus/mm-decode.el 2012-01-04 22:14:09 +0000 @@ -1,6 +1,6 @@ ;;; mm-decode.el --- Functions for decoding MIME things -;; Copyright (C) 1998-2011 Free Software Foundation, Inc. +;; Copyright (C) 1998-2012 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; MORIOKA Tomohiko @@ -1724,6 +1724,7 @@ (buffer-string)))))) shr-inhibit-images shr-blocked-images charset char) (if (and (boundp 'gnus-summary-buffer) + (bufferp gnus-summary-buffer) (buffer-name gnus-summary-buffer)) (with-current-buffer gnus-summary-buffer (setq shr-inhibit-images gnus-inhibit-images === modified file 'lisp/gnus/nndraft.el' --- lisp/gnus/nndraft.el 2011-08-17 00:10:46 +0000 +++ lisp/gnus/nndraft.el 2012-01-04 22:14:09 +0000 @@ -181,13 +181,14 @@ (gnus-get-new-news-hook nil) (inhibit-read-only t)) (gnus-group-get-new-news-this-group nil t) - (dolist (group groups) - (unless (and gnus-permanently-visible-groups - (string-match gnus-permanently-visible-groups - group)) - (gnus-group-goto-group group) - (when (zerop (gnus-group-group-unread)) - (gnus-delete-line))))))) + (save-excursion + (dolist (group groups) + (unless (and gnus-permanently-visible-groups + (string-match gnus-permanently-visible-groups + group)) + (gnus-group-goto-group group) + (when (zerop (gnus-group-group-unread)) + (gnus-delete-line)))))))) (deffoo nndraft-request-associate-buffer (group) "Associate the current buffer with some article in the draft group." === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-12-30 02:52:49 +0000 +++ lisp/gnus/nnir.el 2012-01-04 22:14:09 +0000 @@ -1,6 +1,6 @@ ;;; nnir.el --- search mail with various search engines -*- coding: iso-8859-1 -*- -;; Copyright (C) 1998-2011 Free Software Foundation, Inc. +;; Copyright (C) 1998-2012 Free Software Foundation, Inc. ;; Author: Kai Großjohann ;; Swish-e and Swish++ backends by: @@ -670,7 +670,8 @@ (goto-char (point-min)) (while (not (eobp)) (let* ((novitem (funcall parsefunc)) - (artno (mail-header-number novitem)) + (artno (and novitem + (mail-header-number novitem))) (art (car (rassq artno articleids)))) (when art (mail-header-set-number novitem art) ------------------------------------------------------------ revno: 106773 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2012-01-04 20:51:47 +0200 message: Rmail: support citations with non-ASCII letters in names lisp/mail/rmail.el (rmail-font-lock-keywords): Accept non-ASCII letters in cite-prefix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-01-03 19:41:14 +0000 +++ lisp/ChangeLog 2012-01-04 18:51:47 +0000 @@ -1,3 +1,8 @@ +2012-01-04 Eli Zaretskii + + * mail/rmail.el (rmail-font-lock-keywords): Accept non-ASCII + letters in cite-prefix. + 2012-01-03 Lars Magne Ingebrigtsen * mail/smtpmail.el (smtpmail-stream-type): Mention the `ssl' value. === modified file 'lisp/mail/rmail.el' --- lisp/mail/rmail.el 2011-12-31 10:06:21 +0000 +++ lisp/mail/rmail.el 2012-01-04 18:51:47 +0000 @@ -791,7 +791,7 @@ ;; These are all matched case-insensitively. (eval-when-compile (let* ((cite-chars "[>|}]") - (cite-prefix "a-z") + (cite-prefix "[:alpha:]") (cite-suffix (concat cite-prefix "0-9_.@-`'\""))) (list '("^\\(From\\|Sender\\|Resent-From\\):" . 'rmail-header-name) ------------------------------------------------------------ revno: 106772 committer: Bastien Guerry branch nick: trunk timestamp: Wed 2012-01-04 16:20:49 +0100 message: Fix trailing whitespaces in Org files. diff: === modified file 'lisp/org/ob-awk.el' --- lisp/org/ob-awk.el 2012-01-04 15:13:14 +0000 +++ lisp/org/ob-awk.el 2012-01-04 15:20:49 +0000 @@ -24,9 +24,9 @@ ;;; Commentary: ;; Babel's awk can use special header argument: -;; +;; ;; - :in-file takes a path to a file of data to be processed by awk -;; +;; ;; - :stdin takes an Org-mode data or code block reference, the value ;; of which will be passed to the awk process through STDIN === modified file 'lisp/org/ob-gnuplot.el' --- lisp/org/ob-gnuplot.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-gnuplot.el 2012-01-04 15:20:49 +0000 @@ -34,7 +34,7 @@ ;;; Requirements: ;; - gnuplot :: http://www.gnuplot.info/ -;; +;; ;; - gnuplot-mode :: http://cars9.uchicago.edu/~ravel/software/gnuplot-mode.html ;;; Code: === modified file 'lisp/org/ob-haskell.el' --- lisp/org/ob-haskell.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-haskell.el 2012-01-04 15:20:49 +0000 @@ -79,7 +79,7 @@ (cdr (member org-babel-haskell-eoe (reverse (mapcar #'org-babel-trim raw))))))) (org-babel-reassemble-table - (cond + (cond ((equal result-type 'output) (mapconcat #'identity (reverse (cdr results)) "\n")) ((equal result-type 'value) === modified file 'lisp/org/ob-lilypond.el' --- lisp/org/ob-lilypond.el 2012-01-04 14:49:41 +0000 +++ lisp/org/ob-lilypond.el 2012-01-04 15:20:49 +0000 @@ -114,7 +114,7 @@ body)))) vars) body)) - + (defun org-babel-execute:lilypond (body params) "This function is called by `org-babel-execute-src-block'. Depending on whether we are in arrange mode either: @@ -138,7 +138,7 @@ (defun ly-process-basic (body params) "Execute a lilypond block in basic mode" - + (let* ((result-params (cdr (assoc :result-params params))) (out-file (cdr (assoc :file params))) (cmdline (or (cdr (assoc :cmdline params)) @@ -147,7 +147,7 @@ (with-temp-file in-file (insert (org-babel-expand-body:generic body params))) - + (org-babel-eval (concat (ly-determine-ly-path) @@ -177,7 +177,7 @@ (ly-temp-file (ly-switch-extension (buffer-file-name) ".ly"))) (if (file-exists-p ly-tangled-file) - (progn + (progn (when (file-exists-p ly-temp-file) (delete-file ly-temp-file)) (rename-file ly-tangled-file @@ -243,7 +243,7 @@ "Mark the erroneous lines in the lilypond org buffer. FILE-NAME is full path to lilypond file. LINE is the erroneous line" - + (switch-to-buffer-other-window (concat (file-name-nondirectory (ly-switch-extension file-name ".org")))) @@ -256,7 +256,7 @@ (set-mark (point)) (goto-char (- (point) (length line)))) (goto-char temp)))) - + (defun ly-parse-line-num (&optional buffer) "Extract error line number." @@ -284,7 +284,7 @@ "Extract the erroneous line from the tangled .ly file FILE-NAME is full path to lilypond file. LINENO is the number of the erroneous line" - + (with-temp-buffer (insert-file-contents (ly-switch-extension file-name ".ly") nil nil nil t) @@ -294,12 +294,12 @@ (forward-line (- lineNo 1)) (buffer-substring (point) (point-at-eol))) nil))) - + (defun ly-attempt-to-open-pdf (file-name &optional test) "Attempt to display the generated pdf file FILE-NAME is full path to lilypond file If TEST is non-nil, the shell command is returned and is not run" - + (when ly-display-pdf-post-tangle (let ((pdf-file (ly-switch-extension file-name ".pdf"))) (if (file-exists-p pdf-file) @@ -340,7 +340,7 @@ (defun ly-determine-pdf-path (&optional test) "Return correct path to pdf viewer depending on OS If TEST is non-nil, it contains a simulation of the OS for test purposes" - + (let ((sys-type (or test system-type))) (cond ((string= sys-type "darwin") @@ -352,7 +352,7 @@ (defun ly-determine-midi-path (&optional test) "Return correct path to midi player depending on OS If TEST is non-nil, it contains a simulation of the OS for test purposes" - + (let ((sys-type (or test test system-type))) (cond ((string= sys-type "darwin") @@ -360,10 +360,10 @@ ((string= sys-type "win32") ly-win32-midi-path) (t ly-nix-midi-path)))) - + (defun ly-toggle-midi-play () "Toggle whether midi will be played following a successful compilation" - + (interactive) (setq ly-play-midi-post-tangle (not ly-play-midi-post-tangle)) @@ -373,7 +373,7 @@ (defun ly-toggle-pdf-display () "Toggle whether pdf will be displayed following a successful compilation" - + (interactive) (setq ly-display-pdf-post-tangle (not ly-display-pdf-post-tangle)) === modified file 'lisp/org/ob-lob.el' --- lisp/org/ob-lob.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-lob.el 2012-01-04 15:20:49 +0000 @@ -104,7 +104,7 @@ (beginning-of-line 1) (when (looking-at org-babel-lob-one-liner-regexp) (append - (mapcar #'org-babel-clean-text-properties + (mapcar #'org-babel-clean-text-properties (list (format "%s%s(%s)%s" (nonempty 3 12) @@ -115,7 +115,7 @@ (nonempty 9 18))) (list (length (if (= (length (match-string 12)) 0) (match-string 2) (match-string 11)))))))))) - + (defun org-babel-lob-execute (info) "Execute the lob call specified by INFO." (let ((params (org-babel-process-params === modified file 'lisp/org/ob-ocaml.el' --- lisp/org/ob-ocaml.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-ocaml.el 2012-01-04 15:20:49 +0000 @@ -98,7 +98,7 @@ (lambda (pair) (format "let %s = %s;;" (car pair) (org-babel-ocaml-elisp-to-ocaml (cdr pair)))) (mapcar #'cdr (org-babel-get-header params :var)))) - + (defun org-babel-ocaml-elisp-to-ocaml (val) "Return a string of ocaml code which evaluates to VAL." (if (listp val) === modified file 'lisp/org/ob-picolisp.el' --- lisp/org/ob-picolisp.el 2012-01-04 14:49:41 +0000 +++ lisp/org/ob-picolisp.el 2012-01-04 15:20:49 +0000 @@ -44,10 +44,10 @@ ;; PicoLisp _is_ an object-oriented database with a Prolog-based query ;; language implemented in PicoLisp (Pilog). Database objects are -;; first-class members of the language. +;; first-class members of the language. ;; PicoLisp is an extremely productive framework for the development -;; of interactive web-applications (on top of a database). +;; of interactive web-applications (on top of a database). ;;; Requirements: @@ -95,7 +95,7 @@ (defun org-babel-execute:picolisp (body params) "Execute a block of Picolisp code with org-babel. This function is - called by `org-babel-execute-src-block'" + called by `org-babel-execute-src-block'" (message "executing Picolisp source code block") (let* ( ;; name of the session or "none" @@ -118,7 +118,7 @@ ((member "value" result-params) (format "(out \"/dev/null\" %s)" full-body)) (t full-body)))) - + ((lambda (result) (if (or (member "verbatim" result-params) (member "scalar" result-params) === modified file 'lisp/org/ob-ref.el' --- lisp/org/ob-ref.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-ref.el 2012-01-04 15:20:49 +0000 @@ -60,7 +60,7 @@ (declare-function org-narrow-to-subtree "org" ()) (declare-function org-id-find-id-in-file "org-id" (id file &optional markerp)) (declare-function org-show-context "org" (&optional key)) -(declare-function org-pop-to-buffer-same-window +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (defvar org-babel-ref-split-regexp === modified file 'lisp/org/ob-ruby.el' --- lisp/org/ob-ruby.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-ruby.el 2012-01-04 15:20:49 +0000 @@ -28,10 +28,10 @@ ;;; Requirements: ;; - ruby and irb executables :: http://www.ruby-lang.org/ -;; +;; ;; - ruby-mode :: Can be installed through ELPA, or from ;; http://github.com/eschulte/rinari/raw/master/util/ruby-mode.el -;; +;; ;; - inf-ruby mode :: Can be installed through ELPA, or from ;; http://github.com/eschulte/rinari/raw/master/util/inf-ruby.el === modified file 'lisp/org/ob-sql.el' --- lisp/org/ob-sql.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-sql.el 2012-01-04 15:20:49 +0000 @@ -39,7 +39,7 @@ ;; - add more useful header arguments (user, passwd, database, etc...) ;; - support for more engines (currently only supports mysql) ;; - what's a reasonable way to drop table data into SQL? -;; +;; ;;; Code: (require 'ob) === modified file 'lisp/org/org-ascii.el' --- lisp/org/org-ascii.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-ascii.el 2012-01-04 15:20:49 +0000 @@ -108,7 +108,7 @@ (defun org-export-as-utf8 (&rest args) "Like `org-export-as-ascii', use encoding for special symbols." (interactive) - (org-export-as-encoding 'org-export-as-ascii + (org-export-as-encoding 'org-export-as-ascii (org-called-interactively-p 'any) 'utf8 args)) === modified file 'lisp/org/org-capture.el' --- lisp/org/org-capture.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-capture.el 2012-01-04 15:20:49 +0000 @@ -56,7 +56,7 @@ (date &optional keep-restriction)) (declare-function org-table-get-specials "org-table" ()) (declare-function org-table-goto-line "org-table" (N)) -(declare-function org-pop-to-buffer-same-window "org-compat" +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (defvar org-remember-default-headline) === modified file 'lisp/org/org-clock.el' --- lisp/org/org-clock.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-clock.el 2012-01-04 15:20:49 +0000 @@ -2000,7 +2000,7 @@ (encode-time 0 0 0 (+ d n) m y)))) ((and wp (string-match "w\\|W" wp) mw (> (length wp) 0)) (require 'cal-iso) - (setq date (calendar-gregorian-from-absolute + (setq date (calendar-gregorian-from-absolute (calendar-absolute-from-iso (list (+ mw n) 1 y)))) (setq ins (format-time-string "%G-W%V" @@ -2017,7 +2017,7 @@ (setq mw 5 y (- y 1)) ()) - (setq date (calendar-gregorian-from-absolute + (setq date (calendar-gregorian-from-absolute (calendar-absolute-from-iso (org-quarter-to-date (+ mw n) y)))) (setq ins (format-time-string (concatenate 'string (number-to-string y) "-Q" (number-to-string (+ mw n))) @@ -2642,4 +2642,3 @@ (provide 'org-clock) ;;; org-clock.el ends here - === modified file 'lisp/org/org-crypt.el' --- lisp/org/org-crypt.el 2012-01-04 14:49:41 +0000 +++ lisp/org/org-crypt.el 2012-01-04 15:20:49 +0000 @@ -76,21 +76,21 @@ (defgroup org-crypt nil "Org Crypt" - :tag "Org Crypt" + :tag "Org Crypt" :group 'org) (defcustom org-crypt-tag-matcher "crypt" "The tag matcher used to find headings whose contents should be encrypted. See the \"Match syntax\" section of the org manual for more details." - :type 'string + :type 'string :group 'org-crypt) (defcustom org-crypt-key "" "The default key to use when encrypting the contents of a heading. This setting can also be overridden in the CRYPTKEY property." - :type 'string + :type 'string :group 'org-crypt) (defcustom org-crypt-disable-auto-save 'ask === modified file 'lisp/org/org-gnus.el' --- lisp/org/org-gnus.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-gnus.el 2012-01-04 15:20:49 +0000 @@ -175,7 +175,7 @@ (setq to (or to (gnus-fetch-original-field "To")) newsgroups (gnus-fetch-original-field "Newsgroups") x-no-archive (gnus-fetch-original-field "x-no-archive"))) - (org-store-link-props :type "gnus" :from from :subject subject + (org-store-link-props :type "gnus" :from from :subject subject :message-id message-id :group group :to to) (when date (org-add-link-props :date date :date-timestamp date-ts === modified file 'lisp/org/org-id.el' --- lisp/org/org-id.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-id.el 2012-01-04 15:20:49 +0000 @@ -73,7 +73,7 @@ (require 'org) (declare-function message-make-fqdn "message" ()) -(declare-function org-pop-to-buffer-same-window +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) ;;; Customization @@ -641,7 +641,3 @@ (provide 'org-id) ;;; org-id.el ends here - - - - === modified file 'lisp/org/org-irc.el' --- lisp/org/org-irc.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-irc.el 2012-01-04 15:20:49 +0000 @@ -59,7 +59,7 @@ (declare-function erc-server-buffer "erc" ()) (declare-function erc-get-server-nickname-list "erc" ()) (declare-function erc-cmd-JOIN "erc" (channel &optional key)) -(declare-function org-pop-to-buffer-same-window +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (defvar org-irc-client 'erc === modified file 'lisp/org/org-latex.el' --- lisp/org/org-latex.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-latex.el 2012-01-04 15:20:49 +0000 @@ -302,8 +302,8 @@ (defcustom org-export-latex-href-format "\\href{%s}{%s}" "A printf format string to be applied to href links. -The format must contain either two %s instances or just one. -If it contains two %s instances, the first will be filled with +The format must contain either two %s instances or just one. +If it contains two %s instances, the first will be filled with the link, the second with the link description. If it contains only one, the %s will be filled with the link." :group 'org-export-latex @@ -2226,7 +2226,7 @@ ;; a LaTeX issue, but we here implement a work-around anyway. (setq path (org-export-latex-protect-amp path) desc (org-export-latex-protect-amp desc))) - (insert + (insert (if (string-match "%s.*%s" org-export-latex-href-format) (format org-export-latex-href-format path desc) (format org-export-latex-href-format path)))) === modified file 'lisp/org/org-mks.el' --- lisp/org/org-mks.el 2012-01-04 14:49:41 +0000 +++ lisp/org/org-mks.el 2012-01-04 15:20:49 +0000 @@ -24,7 +24,7 @@ ;;; Commentary: -;; +;; ;;; Code: === modified file 'lisp/org/org-mobile.el' --- lisp/org/org-mobile.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-mobile.el 2012-01-04 15:20:49 +0000 @@ -37,7 +37,7 @@ (eval-when-compile (require 'cl)) -(declare-function org-pop-to-buffer-same-window +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (defgroup org-mobile nil @@ -272,7 +272,7 @@ (t nil))) org-mobile-files))) (files (delete - nil + nil (mapcar (lambda (f) (unless (and (not (string= org-mobile-files-exclude-regexp "")) (string-match org-mobile-files-exclude-regexp f)) @@ -499,7 +499,7 @@ org-mobile-directory)) (save-excursion (setq buf (find-file file)) - (when (and (= (point-min) (point-max))) + (when (and (= (point-min) (point-max))) (insert "\n") (save-buffer) (when org-mobile-use-encryption @@ -1099,4 +1099,3 @@ (provide 'org-mobile) ;;; org-mobile.el ends here - === modified file 'lisp/org/org-pcomplete.el' --- lisp/org/org-pcomplete.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-pcomplete.el 2012-01-04 15:20:49 +0000 @@ -146,7 +146,7 @@ (org-split-string (org-get-current-options) "\n")) org-additional-option-like-keywords))))) (substring pcomplete-stub 2))) - + (defvar org-startup-options) (defun pcomplete/org-mode/file-option/startup () "Complete arguments for the #+STARTUP file option." === modified file 'lisp/org/org-publish.el' --- lisp/org/org-publish.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-publish.el 2012-01-04 15:20:49 +0000 @@ -368,7 +368,7 @@ (declare-function org-publish-delete-dups "org-publish" (list)) (declare-function find-lisp-find-files "find-lisp" (directory regexp)) -(declare-function org-pop-to-buffer-same-window +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -1127,7 +1127,7 @@ (let ((ctime (org-publish-cache-ctime-of-src filename))) (or (< pstamp ctime) (when included-files-ctime - (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) + (not (null (delq nil (mapcar (lambda(ct) (< ctime ct)) included-files-ctime)))))))))) (defun org-publish-cache-set-file-property (filename property value &optional project-name) === modified file 'lisp/org/org-remember.el' --- lisp/org/org-remember.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-remember.el 2012-01-04 15:20:49 +0000 @@ -39,7 +39,7 @@ (declare-function remember "remember" (&optional initial)) (declare-function remember-buffer-desc "remember" ()) (declare-function remember-finalize "remember" ()) -(declare-function org-pop-to-buffer-same-window +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (defvar remember-save-after-remembering) @@ -1152,4 +1152,3 @@ (provide 'org-remember) ;;; org-remember.el ends here - === modified file 'lisp/org/org-special-blocks.el' --- lisp/org/org-special-blocks.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-special-blocks.el 2012-01-04 15:20:49 +0000 @@ -51,7 +51,7 @@ (defun org-special-blocks-make-special-cookies () "Adds special cookies when #+begin_foo and #+end_foo tokens are seen. This is run after a few special cases are taken care of." - (when (or (eq org-export-current-backend 'html) + (when (or (eq org-export-current-backend 'html) (eq org-export-current-backend 'latex)) (goto-char (point-min)) (while (re-search-forward "^[ \t]*#\\+\\(begin\\|end\\)_\\(.*\\)$" nil t) === modified file 'lisp/org/org-src.el' --- lisp/org/org-src.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-src.el 2012-01-04 15:20:49 +0000 @@ -41,7 +41,7 @@ (declare-function org-at-table.el-p "org" ()) (declare-function org-get-indentation "org" (&optional line)) (declare-function org-switch-to-buffer-other-window "org" (&rest args)) -(declare-function org-pop-to-buffer-same-window +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) (defcustom org-edit-src-region-extra nil === modified file 'lisp/org/org-table.el' --- lisp/org/org-table.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-table.el 2012-01-04 15:20:49 +0000 @@ -2436,7 +2436,7 @@ (modes (copy-sequence org-calc-default-modes)) (numbers nil) ; was a variable, now fixed default (keep-empty nil) - n form form0 formrpl formrg bw fmt x ev orig c lispp literal + n form form0 formrpl formrg bw fmt x ev orig c lispp literal duration duration-output-format) ;; Parse the format string. Since we have a lot of modes, this is ;; a lot of work. However, I think calc still uses most of the time. @@ -2461,7 +2461,7 @@ duration-output-format nil fmt (replace-match "" t t fmt))) (if (string-match "t" fmt) - (setq duration t + (setq duration t duration-output-format org-table-duration-custom-format numbers t fmt (replace-match "" t t fmt))) @@ -2529,7 +2529,7 @@ ;; Insert complex ranges (while (and (string-match org-table-range-regexp form) (> (length (match-string 0 form)) 1)) - (setq formrg (save-match-data + (setq formrg (save-match-data (org-table-get-range (match-string 0 form) nil n0))) (setq formrpl (save-match-data @@ -4759,4 +4759,3 @@ (provide 'org-table) ;;; org-table.el ends here - === modified file 'lisp/org/org-taskjuggler.el' --- lisp/org/org-taskjuggler.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-taskjuggler.el 2012-01-04 15:20:49 +0000 @@ -355,8 +355,8 @@ (let* ((props (org-entry-properties)) (components (org-heading-components)) (level (nth 1 components)) - (headline - (replace-regexp-in-string + (headline + (replace-regexp-in-string "\"" "\\\"" (nth 4 components) t t)) ; quote double quotes in headlines (parent-ordered (org-taskjuggler-parent-is-ordered-p))) (push (cons "level" level) props) @@ -406,10 +406,10 @@ (successor (car (cdr tasks)))) (cond ;; if a task has no successors it is a leaf - ((null successor) + ((null successor) (push (cons (cons "leaf-node" t) task) new-list)) ;; if the successor has a lower level than task it is a leaf - ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task))) + ((<= (cdr (assoc "level" successor)) (cdr (assoc "level" task))) (push (cons (cons "leaf-node" t) task) new-list)) ;; otherwise examine the rest of the tasks (t (push task new-list)))) ------------------------------------------------------------ revno: 106771 committer: Bastien Guerry branch nick: trunk timestamp: Wed 2012-01-04 16:13:14 +0100 message: Fix even more copyright year for Org files. diff: === modified file 'lisp/org/ob-awk.el' --- lisp/org/ob-awk.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-awk.el 2012-01-04 15:13:14 +0000 @@ -1,6 +1,6 @@ ;;; ob-awk.el --- org-babel functions for awk evaluation -;; Copyright (C) 2012 Free Software Foundation, Inc. +;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-fortran.el' --- lisp/org/ob-fortran.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-fortran.el 2012-01-04 15:13:14 +0000 @@ -1,6 +1,6 @@ ;;; ob-fortran.el --- org-babel functions for fortran -;; Copyright (C) 2012 Sergey Litvinov, Eric Schulte +;; Copyright (C) 2011-2012 Sergey Litvinov, Eric Schulte ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte ;; Keywords: literate programming, reproducible research, fortran === modified file 'lisp/org/ob-java.el' --- lisp/org/ob-java.el 2012-01-04 14:14:29 +0000 +++ lisp/org/ob-java.el 2012-01-04 15:13:14 +0000 @@ -1,6 +1,6 @@ ;;; ob-java.el --- org-babel functions for java evaluation -;; Copyright (C) 2012 Free Software Foundation, Inc. +;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/org-eshell.el' --- lisp/org/org-eshell.el 2012-01-04 14:14:29 +0000 +++ lisp/org/org-eshell.el 2012-01-04 15:13:14 +0000 @@ -1,5 +1,5 @@ ;;; org-eshell.el - Support for links to working directories in eshell -;; Copyright (C) 2012 Free Software Foundation, Inc. +;; Copyright (C) 2011-2012 Free Software Foundation, Inc. ;; ;; Author: Konrad Hinsen ;; Version: 0.1 ------------------------------------------------------------ revno: 106770 committer: Bastien Guerry branch nick: trunk timestamp: Wed 2012-01-04 15:49:41 +0100 message: Fix more copyright year for Org files. diff: === modified file 'lisp/org/ob-C.el' --- lisp/org/ob-C.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-C.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-C.el --- org-babel functions for C and similar languages -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-calc.el' --- lisp/org/ob-calc.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-calc.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-calc.el --- org-babel functions for calc code evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc +;; Copyright (C) 2010-2012 Free Software Foundation, Inc ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-ledger.el' --- lisp/org/ob-ledger.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-ledger.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-ledger.el --- org-babel functions for ledger evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Keywords: literate programming, reproducible research, accounting === modified file 'lisp/org/ob-lilypond.el' --- lisp/org/ob-lilypond.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-lilypond.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-lilypond.el --- org-babel functions for lilypond evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Martyn Jago ;; Keywords: babel language, literate programming === modified file 'lisp/org/ob-matlab.el' --- lisp/org/ob-matlab.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-matlab.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-matlab.el --- org-babel support for matlab evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-mscgen.el' --- lisp/org/ob-mscgen.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-mscgen.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-msc.el --- org-babel functions for mscgen evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Juan Pechiar ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-octave.el' --- lisp/org/ob-octave.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-octave.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-octave.el --- org-babel functions for octave and matlab evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-picolisp.el' --- lisp/org/ob-picolisp.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-picolisp.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-picolisp.el --- org-babel functions for picolisp evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Authors: Thorsten Jolitz and Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-plantuml.el' --- lisp/org/ob-plantuml.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-plantuml.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-plantuml.el --- org-babel functions for plantuml evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Zhang Weize ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-sqlite.el' --- lisp/org/ob-sqlite.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-sqlite.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction -;; Copyright (C) 2010-2011 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/org-crypt.el' --- lisp/org/org-crypt.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-crypt.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; org-crypt.el --- Public key encryption for org-mode entries -;; Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2007, 2009-2012 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Filename: org-crypt.el === modified file 'lisp/org/org-mks.el' --- lisp/org/org-mks.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-mks.el 2012-01-04 14:49:41 +0000 @@ -1,6 +1,6 @@ ;;; org-mks.el --- Multi-key-selection for Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ------------------------------------------------------------ revno: 106769 committer: Bastien Guerry branch nick: trunk timestamp: Wed 2012-01-04 15:14:29 +0100 message: Fix copyright year for Org files. diff: === modified file 'etc/org/README' --- etc/org/README 2012-01-04 06:39:31 +0000 +++ etc/org/README 2012-01-04 14:14:29 +0000 @@ -1,7 +1,7 @@ The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the following copyright information: -Copyright (C) 2010-2011 Free Software Foundation, Inc. +Copyright (C) 2010-2012 Free Software Foundation, Inc. These file are part of GNU Emacs. === modified file 'lisp/org/ob-R.el' --- lisp/org/ob-R.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-R.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-R.el --- org-babel functions for R code evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison === modified file 'lisp/org/ob-asymptote.el' --- lisp/org/ob-asymptote.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-asymptote.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-awk.el' --- lisp/org/ob-awk.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-awk.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-awk.el --- org-babel functions for awk evaluation -;; Copyright (C) 2011 Free Software Foundation, Inc. +;; Copyright (C) 2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-clojure.el' --- lisp/org/ob-clojure.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-clojure.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-clojure.el --- org-babel functions for clojure evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Joel Boehland ;; Eric Schulte === modified file 'lisp/org/ob-comint.el' --- lisp/org/ob-comint.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-comint.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-comint.el --- org-babel functions for interaction with comint buffers -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint === modified file 'lisp/org/ob-css.el' --- lisp/org/ob-css.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-css.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-css.el --- org-babel functions for css evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-ditaa.el' --- lisp/org/ob-ditaa.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-ditaa.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-ditaa.el --- org-babel functions for ditaa evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research @@ -39,10 +39,22 @@ (require 'ob) (defvar org-babel-default-header-args:ditaa - '((:results . "file") (:exports . "results") (:java . "-Dfile.encoding=UTF-8")) + '((:results . "file") + (:exports . "results") + (:java . "-Dfile.encoding=UTF-8")) "Default arguments for evaluating a ditaa source block.") -(defvar org-ditaa-jar-path) +(defcustom org-ditaa-jar-path nil + "Path for the ditaa jar file." + :group 'org-babel + :type 'string) + +(defcustom org-ditaa-jar-option "-jar" + "Option for the ditaa jar file. +Do not leave leading or trailing spaces in this string." + :group 'org-babel + :type 'string) + (defun org-babel-execute:ditaa (body params) "Execute a block of Ditaa code with org-babel. This function is called by `org-babel-execute-src-block'." @@ -55,7 +67,7 @@ (cmdline (cdr (assoc :cmdline params))) (java (cdr (assoc :java params))) (in-file (org-babel-temp-file "ditaa-")) - (cmd (concat "java " java " -jar " + (cmd (concat "java " java " " org-ditaa-jar-option " " (shell-quote-argument (expand-file-name org-ditaa-jar-path)) " " cmdline === modified file 'lisp/org/ob-dot.el' --- lisp/org/ob-dot.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-dot.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-dot.el --- org-babel functions for dot evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-emacs-lisp.el' --- lisp/org/ob-emacs-lisp.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-emacs-lisp.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc +;; Copyright (C) 2009-2012 Free Software Foundation, Inc ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-eval.el' --- lisp/org/ob-eval.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-eval.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-eval.el --- org-babel functions for external code evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, comint === modified file 'lisp/org/ob-exp.el' --- lisp/org/ob-exp.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-exp.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-exp.el --- Exportation of org-babel source blocks -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison === modified file 'lisp/org/ob-fortran.el' --- lisp/org/ob-fortran.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-fortran.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-fortran.el --- org-babel functions for fortran -;; Copyright (C) 2011 Sergey Litvinov, Eric Schulte +;; Copyright (C) 2012 Sergey Litvinov, Eric Schulte ;; Authors: Sergey Litvinov (based on ob-C.el by Eric Schulte), Eric Schulte ;; Keywords: literate programming, reproducible research, fortran === modified file 'lisp/org/ob-gnuplot.el' --- lisp/org/ob-gnuplot.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-gnuplot.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-haskell.el' --- lisp/org/ob-haskell.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-haskell.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-haskell.el --- org-babel functions for haskell evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-java.el' --- lisp/org/ob-java.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-java.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-java.el --- org-babel functions for java evaluation -;; Copyright (C) 2011 Free Software Foundation, Inc. +;; Copyright (C) 2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-js.el' --- lisp/org/ob-js.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-js.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-js.el --- org-babel functions for Javascript -;; Copyright (C) 2010-2011 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js === modified file 'lisp/org/ob-keys.el' --- lisp/org/ob-keys.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-keys.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-keys.el --- key bindings for org-babel -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-latex.el' --- lisp/org/ob-latex.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-latex.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-latex.el --- org-babel functions for latex "evaluation" -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-lisp.el' --- lisp/org/ob-lisp.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-lisp.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-lisp.el --- org-babel functions for common lisp evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Joel Boehland ;; Eric Schulte === modified file 'lisp/org/ob-lob.el' --- lisp/org/ob-lob.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-lob.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-lob.el --- functions supporting the Library of Babel -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison === modified file 'lisp/org/ob-maxima.el' --- lisp/org/ob-maxima.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-maxima.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-maxima.el --- org-babel functions for maxima evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Eric Schulte === modified file 'lisp/org/ob-ocaml.el' --- lisp/org/ob-ocaml.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-ocaml.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-ocaml.el --- org-babel functions for ocaml evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-org.el' --- lisp/org/ob-org.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-org.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-org.el --- org-babel functions for org code block evaluation -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-perl.el' --- lisp/org/ob-perl.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-perl.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-perl.el --- org-babel functions for perl evaluation -;; Copyright (C) 2009-2011 Free Software Foundation +;; Copyright (C) 2009-2012 Free Software Foundation ;; Author: Dan Davison ;; Eric Schulte === modified file 'lisp/org/ob-python.el' --- lisp/org/ob-python.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-python.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-python.el --- org-babel functions for python evaluation -;; Copyright (C) 2009-2011 Free Software Foundation +;; Copyright (C) 2009-2012 Free Software Foundation ;; Author: Eric Schulte ;; Dan Davison === modified file 'lisp/org/ob-ref.el' --- lisp/org/ob-ref.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-ref.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-ref.el --- org-babel functions for referencing external data -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison === modified file 'lisp/org/ob-ruby.el' --- lisp/org/ob-ruby.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-ruby.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-ruby.el --- org-babel functions for ruby evaluation -;; Copyright (C) 2009-2011 Free Software Foundation +;; Copyright (C) 2009-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-sass.el' --- lisp/org/ob-sass.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-sass.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-sass.el --- org-babel functions for the sass css generation language -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-scheme.el' --- lisp/org/ob-scheme.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-scheme.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-scheme.el --- org-babel functions for Scheme -;; Copyright (C) 2010-2011 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, scheme === modified file 'lisp/org/ob-screen.el' --- lisp/org/ob-screen.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-screen.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-screen.el --- org-babel support for interactive terminal -;; Copyright (C) 2009-2011 Free Software Foundation +;; Copyright (C) 2009-2012 Free Software Foundation ;; Author: Benjamin Andresen ;; Keywords: literate programming, interactive shell === modified file 'lisp/org/ob-sh.el' --- lisp/org/ob-sh.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-sh.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-sh.el --- org-babel functions for shell evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-shen.el' --- lisp/org/ob-shen.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-shen.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-shen.el --- org-babel functions for Shen -;; Copyright (C) 2010-2011 Free Software Foundation +;; Copyright (C) 2010-2012 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, shen === modified file 'lisp/org/ob-sql.el' --- lisp/org/ob-sql.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-sql.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-sql.el --- org-babel functions for sql evaluation -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-table.el' --- lisp/org/ob-table.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-table.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-table.el --- support for calling org-babel functions from tables -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-tangle.el' --- lisp/org/ob-tangle.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob-tangle.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob-tangle.el --- extract source code from org-mode files -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob.el' --- lisp/org/ob.el 2012-01-03 17:27:21 +0000 +++ lisp/org/ob.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; ob.el --- working with code blocks in org-mode -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Dan Davison @@ -1074,8 +1074,7 @@ either the numeric code of a single character or a list of character alternatives. For example to split on balanced instances of \"[ \t]:\" set ALTS to '((32 9) . 58)." - (flet ((matches (ch spec) (or (and (numberp spec) (= spec ch)) - (member ch spec))) + (flet ((matches (ch spec) (if (listp spec) (member ch spec) (equal spec ch))) (matched (ch last) (if (consp alts) (and (matches ch (cdr alts)) === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-agenda.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-agenda.el --- Dynamic task and appointment lists for Org -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-archive.el' --- lisp/org/org-archive.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-archive.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-archive.el --- Archiving for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-ascii.el' --- lisp/org/org-ascii.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-ascii.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-ascii.el --- ASCII export for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-attach.el' --- lisp/org/org-attach.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-attach.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-attach.el --- Manage file attachments to org-mode tasks -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: org data task === modified file 'lisp/org/org-bbdb.el' --- lisp/org/org-bbdb.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-bbdb.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Thomas Baumann === modified file 'lisp/org/org-beamer.el' --- lisp/org/org-beamer.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-beamer.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode ;; -;; Copyright (C) 2007-2011 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Maintainer: Carsten Dominik === modified file 'lisp/org/org-bibtex.el' --- lisp/org/org-bibtex.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-bibtex.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-bibtex.el --- Org links to BibTeX entries ;; -;; Copyright (C) 2007-2011 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry ;; Carsten Dominik === modified file 'lisp/org/org-capture.el' --- lisp/org/org-capture.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-capture.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-capture.el --- Fast note taking in Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-clock.el' --- lisp/org/org-clock.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-clock.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-colview.el' --- lisp/org/org-colview.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-colview.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-colview.el --- Column View in Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-compat.el' --- lisp/org/org-compat.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-compat.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-compat.el --- Compatibility code for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-ctags.el' --- lisp/org/org-ctags.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-ctags.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-ctags.el - Integrate Emacs "tags" facility with org mode. ;; -;; Copyright (C) 2007-2011 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; Author: Paul Sexton === modified file 'lisp/org/org-datetree.el' --- lisp/org/org-datetree.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-datetree.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-datetree.el --- Create date entries in a tree -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-docbook.el' --- lisp/org/org-docbook.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-docbook.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-docbook.el --- DocBook exporter for org-mode ;; -;; Copyright (C) 2007-2011 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; ;; Emacs Lisp Archive Entry ;; Filename: org-docbook.el === modified file 'lisp/org/org-docview.el' --- lisp/org/org-docview.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-docview.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-docview.el --- support for links to doc-view-mode buffers -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Jan Böcker ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-entities.el' --- lisp/org/org-entities.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-entities.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-entities.el --- Support for special entities in Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Ulf Stegemann === modified file 'lisp/org/org-eshell.el' --- lisp/org/org-eshell.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-eshell.el 2012-01-04 14:14:29 +0000 @@ -1,5 +1,5 @@ ;;; org-eshell.el - Support for links to working directories in eshell -;; Copyright (C) 2011 Free Software Foundation, Inc. +;; Copyright (C) 2012 Free Software Foundation, Inc. ;; ;; Author: Konrad Hinsen ;; Version: 0.1 === modified file 'lisp/org/org-exp-blocks.el' --- lisp/org/org-exp-blocks.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-exp-blocks.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-exp-blocks.el --- pre-process blocks when exporting org files -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Eric Schulte === modified file 'lisp/org/org-exp.el' --- lisp/org/org-exp.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-exp.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-exp.el --- ASCII, HTML, XOXO and iCalendar export for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-faces.el' --- lisp/org/org-faces.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-faces.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-faces.el --- Face definitions for Org-mode. -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-feed.el' --- lisp/org/org-feed.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-feed.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-feed.el --- Add RSS feed items to Org files ;; -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-footnote.el' --- lisp/org/org-footnote.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-footnote.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-footnote.el --- Footnote support in Org and elsewhere ;; -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-freemind.el' --- lisp/org/org-freemind.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-freemind.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-freemind.el --- Export Org files to freemind -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Lennart Borgman (lennart O borgman A gmail O com) ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-gnus.el' --- lisp/org/org-gnus.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-gnus.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-gnus.el --- Support for links to Gnus groups and messages from within Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Tassilo Horn === modified file 'lisp/org/org-habit.el' --- lisp/org/org-habit.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-habit.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-habit.el --- The habit tracking code for Org-mode -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-html.el' --- lisp/org/org-html.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-html.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-html.el --- HTML export for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-icalendar.el' --- lisp/org/org-icalendar.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-icalendar.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-icalendar.el --- iCalendar export for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-id.el' --- lisp/org/org-id.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-id.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-id.el --- Global identifiers for Org-mode entries ;; -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-indent.el' --- lisp/org/org-indent.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-indent.el 2012-01-04 14:14:29 +0000 @@ -1,5 +1,5 @@ ;;; org-indent.el --- Dynamic indentation for Org-mode -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-info.el' --- lisp/org/org-info.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-info.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-info.el --- Support for links to Info nodes from within Org-Mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-inlinetask.el' --- lisp/org/org-inlinetask.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-inlinetask.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-inlinetask.el --- Tasks independent of outline hierarchy -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-irc.el' --- lisp/org/org-irc.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-irc.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-irc.el --- Store links to IRC sessions ;; -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; ;; Author: Philip Jackson ;; Keywords: erc, irc, link, org === modified file 'lisp/org/org-jsinfo.el' --- lisp/org/org-jsinfo.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-jsinfo.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-jsinfo.el --- Support for org-info.js Javascript in Org HTML export -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-latex.el' --- lisp/org/org-latex.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-latex.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-latex.el --- LaTeX exporter for org-mode ;; -;; Copyright (C) 2007-2011 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; ;; Emacs Lisp Archive Entry ;; Filename: org-latex.el === modified file 'lisp/org/org-list.el' --- lisp/org/org-list.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-list.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-list.el --- Plain lists for Org-mode ;; -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry === modified file 'lisp/org/org-lparse.el' --- lisp/org/org-lparse.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-lparse.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-lparse.el --- Line-oriented parser-exporter for Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mac-message.el' --- lisp/org/org-mac-message.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-mac-message.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-mac-message.el --- Links to Apple Mail.app messages from within Org-mode -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Christopher Suckling === modified file 'lisp/org/org-macs.el' --- lisp/org/org-macs.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-macs.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-macs.el --- Top-level definitions for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mew.el' --- lisp/org/org-mew.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-mew.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-mew.el --- Support for links to Mew messages from within Org-mode -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; Author: Tokuya Kameshima ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mhe.el' --- lisp/org/org-mhe.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-mhe.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mobile.el' --- lisp/org/org-mobile.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-mobile.el 2012-01-04 14:14:29 +0000 @@ -1,5 +1,5 @@ ;;; org-mobile.el --- Code for asymmetric sync with a mobile device -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mouse.el' --- lisp/org/org-mouse.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-mouse.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-mouse.el --- Better mouse support for org-mode -;; Copyright (C) 2006-2011 Free Software Foundation +;; Copyright (C) 2006-2012 Free Software Foundation ;; ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik === modified file 'lisp/org/org-odt.el' --- lisp/org/org-odt.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-odt.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-odt.el --- OpenDocumentText export for Org-mode -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Jambunathan K ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-pcomplete.el' --- lisp/org/org-pcomplete.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-pcomplete.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-pcomplete.el --- In-buffer completion code -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; John Wiegley === modified file 'lisp/org/org-plot.el' --- lisp/org/org-plot.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-plot.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-plot.el --- Support for plotting from Org-mode -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; ;; Author: Eric Schulte ;; Keywords: tables, plotting === modified file 'lisp/org/org-protocol.el' --- lisp/org/org-protocol.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-protocol.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions. ;; -;; Copyright (C) 2008-2011 +;; Copyright (C) 2008-2012 ;; Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry === modified file 'lisp/org/org-publish.el' --- lisp/org/org-publish.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-publish.el 2012-01-04 14:14:29 +0000 @@ -1,5 +1,5 @@ ;;; org-publish.el --- publish related org-mode files as a website -;; Copyright (C) 2006-2011 Free Software Foundation, Inc. +;; Copyright (C) 2006-2012 Free Software Foundation, Inc. ;; Author: David O'Toole ;; Maintainer: Carsten Dominik === modified file 'lisp/org/org-remember.el' --- lisp/org/org-remember.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-remember.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-remember.el --- Fast note taking in Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-rmail.el' --- lisp/org/org-rmail.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-rmail.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-rmail.el --- Support for links to Rmail messages from within Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-special-blocks.el' --- lisp/org/org-special-blocks.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-special-blocks.el 2012-01-04 14:14:29 +0000 @@ -1,4 +1,4 @@ -;; Copyright (C) 2009-2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2012 Free Software Foundation, Inc. ;; Author: Chris Gray === modified file 'lisp/org/org-src.el' --- lisp/org/org-src.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-src.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-src.el --- Source code examples in Org ;; -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry === modified file 'lisp/org/org-table.el' --- lisp/org/org-table.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-table.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-table.el --- The table editor for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-taskjuggler.el' --- lisp/org/org-taskjuggler.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-taskjuggler.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-taskjuggler.el --- TaskJuggler exporter for org-mode ;; -;; Copyright (C) 2007-2011 Free Software Foundation, Inc. +;; Copyright (C) 2007-2012 Free Software Foundation, Inc. ;; ;; Emacs Lisp Archive Entry ;; Filename: org-taskjuggler.el === modified file 'lisp/org/org-timer.el' --- lisp/org/org-timer.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-timer.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-timer.el --- The relative timer code for Org-mode -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-vm.el' --- lisp/org/org-vm.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-vm.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-vm.el --- Support for links to VM messages from within Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-w3m.el' --- lisp/org/org-w3m.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-w3m.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-w3m.el --- Support from copy and paste from w3m to Org-mode -;; Copyright (C) 2008-2011 Free Software Foundation, Inc. +;; Copyright (C) 2008-2012 Free Software Foundation, Inc. ;; Author: Andy Stewart ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-wl.el' --- lisp/org/org-wl.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-wl.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-wl.el --- Support for links to Wanderlust messages from within Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Tokuya Kameshima ;; David Maus === modified file 'lisp/org/org-xoxo.el' --- lisp/org/org-xoxo.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org-xoxo.el 2012-01-04 14:14:29 +0000 @@ -1,6 +1,6 @@ ;;; org-xoxo.el --- XOXO export for Org-mode -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org.el' --- lisp/org/org.el 2012-01-03 17:27:21 +0000 +++ lisp/org/org.el 2012-01-04 14:14:29 +0000 @@ -1,12 +1,12 @@ ;;; org.el --- Outline-based notes management and organizer ;; Carstens outline-mode for keeping track of everything. -;; Copyright (C) 2004-2011 Free Software Foundation, Inc. +;; Copyright (C) 2004-2012 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Maintainer: Bastien Guerry ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: http://orgmode.org -;; Version: 7.8.02 +;; Version: 7.8.03 ;; ;; This file is part of GNU Emacs. ;; @@ -203,7 +203,7 @@ ;;; Version -(defconst org-version "7.8.02" +(defconst org-version "7.8.03" "The version number of the file org.el.") (defun org-version (&optional here) ------------------------------------------------------------ revno: 106768 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2012-01-04 10:49:38 +0000 message: Merge changes made in Gnus trunk. 2012-01-04 Julien Danjou * nnimap.el (nnimap-update-info): Fix an error when all articles UIDs change. 2012-01-04 Lars Magne Ingebrigtsen * shr.el (shr-rescale-image): Add :ascent 100 to the rescaled picture, too. * nntp.el (nntp-retrieve-group-data-early): Use it. 2012-01-03 Lars Magne Ingebrigtsen * nntp.el (nntp-retrieval-in-progress): New variable. (nntp-make-process-buffer): Make it buffer-local. * gnus-demon.el (gnus-demon-time-to-step): Resurrect function lost in 2010. (gnus-demon-init): Use it to compute the time if time is on the form "04:23". * gnus-topic.el (gnus-topic-history): Define `gnus-topic-history'. * nnimap.el (nnimap-finish-retrieve-group-infos): Check the connection status in the correct buffer. 2012-01-03 Leo * gnus-topic.el (gnus-topic-goto-next-group): Don't move point around when opening topics (bug#10407). diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-12-30 02:52:49 +0000 +++ lisp/gnus/ChangeLog 2012-01-04 10:49:38 +0000 @@ -1,3 +1,35 @@ +2012-01-04 Julien Danjou + + * nnimap.el (nnimap-update-info): Fix an error when all articles UIDs + change. + +2012-01-04 Lars Magne Ingebrigtsen + + * shr.el (shr-rescale-image): Add :ascent 100 to the rescaled picture, + too. + + * nntp.el (nntp-retrieve-group-data-early): Use it. + +2012-01-03 Lars Magne Ingebrigtsen + + * nntp.el (nntp-retrieval-in-progress): New variable. + (nntp-make-process-buffer): Make it buffer-local. + + * gnus-demon.el (gnus-demon-time-to-step): Resurrect function lost in + 2010. + (gnus-demon-init): Use it to compute the time if time is on the form + "04:23". + + * gnus-topic.el (gnus-topic-history): Define `gnus-topic-history'. + + * nnimap.el (nnimap-finish-retrieve-group-infos): Check the connection + status in the correct buffer. + +2012-01-03 Leo + + * gnus-topic.el (gnus-topic-goto-next-group): Don't move point around + when opening topics (bug#10407). + 2011-12-28 Katsumi Yamaoka * mm-view.el (mm-display-inline-fontify): Add comment. === modified file 'lisp/gnus/gnus-demon.el' --- lisp/gnus/gnus-demon.el 2011-02-25 12:53:00 +0000 +++ lisp/gnus/gnus-demon.el 2012-01-04 10:49:38 +0000 @@ -1,6 +1,6 @@ ;;; gnus-demon.el --- daemonic Gnus behavior -;; Copyright (C) 1995-2011 Free Software Foundation, Inc. +;; Copyright (C) 1995-2012 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -120,8 +120,12 @@ ;; If t, replace by 1 (time (cond ((eq time t) gnus-demon-timestep) - ((null time) nil) - (t (* time gnus-demon-timestep)))) + ((null time) + nil) + ((stringp time) + (gnus-demon-time-to-step time)) + (t + (* time gnus-demon-timestep)))) (timer (cond ;; (func number t) @@ -144,6 +148,38 @@ (when timer (add-to-list 'gnus-demon-timers timer))))) +(defun gnus-demon-time-to-step (time) + "Find out how many seconds to TIME, which is on the form \"17:43\"." + (let* ((now (current-time)) + ;; obtain NOW as discrete components -- make a vector for speed + (nowParts (decode-time now)) + ;; obtain THEN as discrete components + (thenParts (parse-time-string time)) + (thenHour (elt thenParts 2)) + (thenMin (elt thenParts 1)) + ;; convert time as elements into number of seconds since EPOCH. + (then (encode-time 0 + thenMin + thenHour + ;; If THEN is earlier than NOW, make it + ;; same time tomorrow. Doc for encode-time + ;; says that this is OK. + (+ (elt nowParts 3) + (if (or (< thenHour (elt nowParts 2)) + (and (= thenHour (elt nowParts 2)) + (<= thenMin (elt nowParts 1)))) + 1 0)) + (elt nowParts 4) + (elt nowParts 5) + (elt nowParts 6) + (elt nowParts 7) + (elt nowParts 8))) + ;; calculate number of seconds between NOW and THEN + (diff (+ (* 65536 (- (car then) (car now))) + (- (cadr then) (cadr now))))) + ;; return number of timesteps in the number of seconds + (round (/ diff gnus-demon-timestep)))) + (gnus-add-shutdown 'gnus-demon-cancel 'gnus) (defun gnus-demon-cancel () === modified file 'lisp/gnus/gnus-topic.el' --- lisp/gnus/gnus-topic.el 2011-11-25 07:14:48 +0000 +++ lisp/gnus/gnus-topic.el 2012-01-04 10:49:38 +0000 @@ -1,6 +1,6 @@ ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers -;; Copyright (C) 1995-2011 Free Software Foundation, Inc. +;; Copyright (C) 1995-2012 Free Software Foundation, Inc. ;; Author: Ilja Weis ;; Lars Magne Ingebrigtsen @@ -969,12 +969,15 @@ (if (not group) (if (not (memq 'gnus-topic props)) (goto-char (point-max)) - (gnus-topic-goto-topic (symbol-name (cadr (memq 'gnus-topic props))))) + (let ((topic (symbol-name (cadr (memq 'gnus-topic props))))) + (or (gnus-topic-goto-topic topic) + (gnus-topic-goto-topic (gnus-topic-next-topic topic))))) (if (gnus-group-goto-group group) t ;; The group is no longer visible. (let* ((list (assoc (gnus-group-topic group) gnus-topic-alist)) - (after (cdr (member group (cdr list))))) + (topic-visible (save-excursion (gnus-topic-goto-topic (car list)))) + (after (and topic-visible (cdr (member group (cdr list)))))) ;; First try to put point on a group after the current one. (while (and after (not (gnus-group-goto-group (car after)))) @@ -989,7 +992,9 @@ (if (not (car list)) (goto-char (point-min)) (unless after - (gnus-topic-goto-topic (car list)) + (if topic-visible + (gnus-goto-char topic-visible) + (gnus-topic-goto-topic (gnus-topic-next-topic (car list)))) (setq after nil))) t)))) @@ -1297,6 +1302,8 @@ ;; 2. Can't process on several marked groups with a same name, ;; because gnus-group-marked only keeps one copy. +(defvar gnus-topic-history nil) + (defun gnus-topic-move-group (n topic &optional copyp) "Move the next N groups to TOPIC. If COPYP, copy the groups instead." === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-11-20 02:29:42 +0000 +++ lisp/gnus/nnimap.el 2012-01-04 10:49:38 +0000 @@ -1,6 +1,6 @@ ;;; nnimap.el --- IMAP interface for Gnus -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Simon Josefsson @@ -1273,11 +1273,11 @@ (deffoo nnimap-finish-retrieve-group-infos (server infos sequences) (when (and sequences + (nnimap-possibly-change-group nil server) ;; Check that the process is still alive. (get-buffer-process (nnimap-buffer)) (memq (process-status (get-buffer-process (nnimap-buffer))) - '(open run)) - (nnimap-possibly-change-group nil server)) + '(open run))) (with-current-buffer (nnimap-buffer) ;; Wait for the final data to trickle in. (when (nnimap-wait-for-response (if (eq (cadar sequences) 'qresync) @@ -1332,7 +1332,8 @@ (cdr (assq 'uidvalidity (gnus-info-params info))))) (and old-uidvalidity (not (equal old-uidvalidity uidvalidity)) - (> start-article 1))) + (or (not start-article) + (> start-article 1)))) (gnus-group-remove-parameter info 'uidvalidity) (gnus-group-remove-parameter info 'modseq)) ;; We have the data needed to update. @@ -1620,8 +1621,9 @@ (nnimap-command "UID SEARCH %s" cmd)))) (when result (gnus-fetch-headers - (and (car result) (delete 0 (mapcar #'string-to-number - (cdr (assoc "SEARCH" (cdr result)))))) + (and (car result) + (delete 0 (mapcar #'string-to-number + (cdr (assoc "SEARCH" (cdr result)))))) nil t)))))) (defun nnimap-possibly-change-group (group server) === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2011-12-04 08:02:42 +0000 +++ lisp/gnus/nntp.el 2012-01-04 10:49:38 +0000 @@ -1,6 +1,6 @@ ;;; nntp.el --- nntp access for Gnus -;; Copyright (C) 1987-1990, 1992-1998, 2000-2011 +;; Copyright (C) 1987-1990, 1992-1998, 2000-2012 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen @@ -281,6 +281,7 @@ ;;; Internal variables. +(defvoo nntp-retrieval-in-progress nil) (defvar nntp-record-commands nil "*If non-nil, nntp will record all commands in the \"*nntp-log*\" buffer.") @@ -770,21 +771,28 @@ (deffoo nntp-retrieve-group-data-early (server infos) "Retrieve group info on INFOS." (nntp-with-open-group nil server - (when (nntp-find-connection-buffer nntp-server-buffer) - ;; The first time this is run, this variable is `try'. So we - ;; try. - (when (eq nntp-server-list-active-group 'try) - (nntp-try-list-active - (gnus-group-real-name (gnus-info-group (car infos))))) - (with-current-buffer (nntp-find-connection-buffer nntp-server-buffer) - (erase-buffer) - (let ((nntp-inhibit-erase t) - (command (if nntp-server-list-active-group - "LIST ACTIVE" "GROUP"))) - (dolist (info infos) - (nntp-send-command - nil command (gnus-group-real-name (gnus-info-group info))))) - (length infos))))) + (let ((buffer (nntp-find-connection-buffer nntp-server-buffer))) + (when (and buffer + (with-current-buffer buffer + (not nntp-retrieval-in-progress))) + ;; The first time this is run, this variable is `try'. So we + ;; try. + (when (eq nntp-server-list-active-group 'try) + (nntp-try-list-active + (gnus-group-real-name (gnus-info-group (car infos))))) + (with-current-buffer buffer + (erase-buffer) + ;; Mark this buffer as "in use" in case we try to issue two + ;; retrievals from the same server. This shouldn't happen, + ;; so this is mostly a sanity check. + (setq nntp-retrieval-in-progress t) + (let ((nntp-inhibit-erase t) + (command (if nntp-server-list-active-group + "LIST ACTIVE" "GROUP"))) + (dolist (info infos) + (nntp-send-command + nil command (gnus-group-real-name (gnus-info-group info))))) + (length infos)))))) (deffoo nntp-finish-retrieve-group-infos (server infos count) (nntp-with-open-group nil server @@ -794,6 +802,8 @@ (car infos))) (received 0) (last-point 1)) + (with-current-buffer buf + (setq nntp-retrieval-in-progress nil)) (when (and buf count) (with-current-buffer buf @@ -1318,6 +1328,7 @@ (set (make-local-variable 'nntp-process-to-buffer) nil) (set (make-local-variable 'nntp-process-start-point) nil) (set (make-local-variable 'nntp-process-decode) nil) + (set (make-local-variable 'nntp-retrieval-in-progress) nil) (current-buffer))) (defun nntp-open-connection (buffer) === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2011-11-23 00:20:17 +0000 +++ lisp/gnus/shr.el 2012-01-04 10:49:38 +0000 @@ -1,6 +1,6 @@ ;;; shr.el --- Simple HTML Renderer -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010-2012 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: html @@ -534,33 +534,33 @@ (insert alt))) (defun shr-rescale-image (data) - (if (or (not (fboundp 'imagemagick-types)) - (not (get-buffer-window (current-buffer)))) - (create-image data nil t - :ascent 100) - (let* ((image (create-image data nil t :ascent 100)) - (size (image-size image t)) - (width (car size)) - (height (cdr size)) - (edges (window-inside-pixel-edges - (get-buffer-window (current-buffer)))) - (window-width (truncate (* shr-max-image-proportion - (- (nth 2 edges) (nth 0 edges))))) - (window-height (truncate (* shr-max-image-proportion - (- (nth 3 edges) (nth 1 edges))))) - scaled-image) - (when (> height window-height) - (setq image (or (create-image data 'imagemagick t - :height window-height) - image)) - (setq size (image-size image t))) - (when (> (car size) window-width) - (setq image (or - (create-image data 'imagemagick t - :width window-width - :ascent 100) - image))) - image))) + (let ((image (create-image data nil t :ascent 100))) + (if (or (not (fboundp 'imagemagick-types)) + (not (get-buffer-window (current-buffer)))) + image + (let* ((size (image-size image t)) + (width (car size)) + (height (cdr size)) + (edges (window-inside-pixel-edges + (get-buffer-window (current-buffer)))) + (window-width (truncate (* shr-max-image-proportion + (- (nth 2 edges) (nth 0 edges))))) + (window-height (truncate (* shr-max-image-proportion + (- (nth 3 edges) (nth 1 edges))))) + scaled-image) + (when (> height window-height) + (setq image (or (create-image data 'imagemagick t + :height window-height + :ascent 100) + image)) + (setq size (image-size image t))) + (when (> (car size) window-width) + (setq image (or + (create-image data 'imagemagick t + :width window-width + :ascent 100) + image))) + image)))) ;; url-cache-extract autoloads url-cache. (declare-function url-cache-create-filename "url-cache" (url)) ------------------------------------------------------------ revno: 106767 committer: Chong Yidong branch nick: trunk timestamp: Wed 2012-01-04 14:39:31 +0800 message: Fix copyright headers for etc/org/ files. Rename etc/org/COPYRIGHT-AND-LICENSE to etc/org/README for consistency with other copyright files, and add a reference to it in the .xml files. diff: === modified file 'etc/org/OrgOdtContentTemplate.xml' --- etc/org/OrgOdtContentTemplate.xml 2012-01-03 17:27:21 +0000 +++ etc/org/OrgOdtContentTemplate.xml 2012-01-04 06:39:31 +0000 @@ -1,4 +1,5 @@ + + === renamed file 'etc/org/COPYRIGHT-AND-LICENSE' => 'etc/org/README' --- etc/org/COPYRIGHT-AND-LICENSE 2012-01-03 17:27:21 +0000 +++ etc/org/README 2012-01-04 06:39:31 +0000 @@ -1,14 +1,9 @@ -OrgOdtContentTemplate.xml --- Aux XML file (Org-mode's OpenDocument export) -OrgOdtStyles.xml --- Aux XML file (Org-mode's OpenDocument export) +The files OrgOdtContentTemplate.xml and OrgOdtStyles.xml have the +following copyright information: Copyright (C) 2010-2011 Free Software Foundation, Inc. -Author: Jambunathan K -Keywords: outlines, hypermedia, calendar, wp -Homepage: http://orgmode.org - -These file are not (yet) part of GNU Emacs. -However, it is distributed under the same license. +These file are part of GNU Emacs. GNU Emacs is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,9 +18,14 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . + +Author: Jambunathan K +Keywords: outlines, hypermedia, calendar, wp +Homepage: http://orgmode.org + Commentary: -Above files are part of Org-mode's OpenDocument export module. +These files are part of Org-mode's OpenDocument export module. OrgOdtContentTemplate.xml provides a template within which the content of an exported document is enclosed. This file contributes to