Now on revision 105498. ------------------------------------------------------------ revno: 105498 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2011-08-19 14:30:29 +0300 message: Avoid a crash in mouse-highlight of Speedbar frames. src/xfaces.c (face_at_buffer_position): Avoid repeated evaluation of face ID by FACE_FROM_ID, and avoid a crash when mouse is moved from an Org mode buffer to a Speedbar frame. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-08-19 10:18:40 +0000 +++ src/ChangeLog 2011-08-19 11:30:29 +0000 @@ -1,5 +1,9 @@ 2011-08-19 Eli Zaretskii + * xfaces.c (face_at_buffer_position): Avoid repeated evaluation of + face ID by FACE_FROM_ID, and avoid a crash when mouse is moved + from an Org mode buffer to a Speedbar frame. + * xdisp.c (RECORD_MAX_MIN_POS): If the display element comes from a composition, take its buffer position from IT->cmp_it.charpos. Fixes cursor positioning at the beginning of a line that begins === modified file 'src/xfaces.c' --- src/xfaces.c 2011-08-14 09:08:02 +0000 +++ src/xfaces.c 2011-08-19 11:30:29 +0000 @@ -6008,9 +6008,18 @@ *endptr = endpos; - default_face = FACE_FROM_ID (f, base_face_id >= 0 ? base_face_id - : NILP (Vface_remapping_alist) ? DEFAULT_FACE_ID - : lookup_basic_face (f, DEFAULT_FACE_ID)); + { + int face_id; + + if (base_face_id >= 0) + face_id = base_face_id; + else if (NILP (Vface_remapping_alist)) + face_id = DEFAULT_FACE_ID; + else + face_id = lookup_basic_face (f, DEFAULT_FACE_ID); + + default_face = FACE_FROM_ID (f, face_id); + } /* Optimize common cases where we can use the default face. */ if (noverlays == 0 ------------------------------------------------------------ revno: 105497 committer: Eli Zaretskii branch nick: trunk timestamp: Fri 2011-08-19 13:18:40 +0300 message: Fix bidi cursor motion when a line begins with a composed character. src/xdisp.c (RECORD_MAX_MIN_POS): If the display element comes from a composition, take its buffer position from IT->cmp_it.charpos. diff: === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-08-15 16:10:39 +0000 +++ lisp/minibuffer.el 2011-08-19 10:18:40 +0000 @@ -1119,13 +1119,27 @@ `(display (space :align-to ,column))) nil)))) (if (not (consp str)) - (put-text-property (point) (progn (insert str) (point)) + (put-text-property (point) + (progn + (insert (bidi-string-mark-left-to-right + str)) + (point)) 'mouse-face 'highlight) - (put-text-property (point) (progn (insert (car str)) (point)) + (put-text-property (point) + (progn + (insert + (bidi-string-mark-left-to-right + (car str))) + (point)) 'mouse-face 'highlight) - (add-text-properties (point) (progn (insert (cadr str)) (point)) + (add-text-properties (point) + (progn + (insert + (bidi-string-mark-left-to-right + (cadr str))) + (point)) '(mouse-face nil - face completions-annotations))) + face completions-annotations))) (cond ((eq completions-format 'vertical) ;; Vertical format === modified file 'src/ChangeLog' --- src/ChangeLog 2011-08-18 18:46:02 +0000 +++ src/ChangeLog 2011-08-19 10:18:40 +0000 @@ -1,3 +1,10 @@ +2011-08-19 Eli Zaretskii + + * xdisp.c (RECORD_MAX_MIN_POS): If the display element comes from + a composition, take its buffer position from IT->cmp_it.charpos. + Fixes cursor positioning at the beginning of a line that begins + with a composed character. + 2011-08-18 Eli Zaretskii * bidi.c (bidi_get_type): If bidi_type_table reports zero as the === modified file 'src/xdisp.c' --- src/xdisp.c 2011-08-16 14:28:19 +0000 +++ src/xdisp.c 2011-08-19 10:18:40 +0000 @@ -18386,15 +18386,22 @@ #define RECORD_MAX_MIN_POS(IT) \ do \ { \ - if (IT_CHARPOS (*(IT)) < min_pos) \ + int composition_p = (IT)->what == IT_COMPOSITION; \ + EMACS_INT current_pos = \ + composition_p ? (IT)->cmp_it.charpos \ + : IT_CHARPOS (*(IT)); \ + EMACS_INT current_bpos = \ + composition_p ? CHAR_TO_BYTE (current_pos) \ + : IT_BYTEPOS (*(IT)); \ + if (current_pos < min_pos) \ { \ - min_pos = IT_CHARPOS (*(IT)); \ - min_bpos = IT_BYTEPOS (*(IT)); \ + min_pos = current_pos; \ + min_bpos = current_bpos; \ } \ - if (IT_CHARPOS (*(IT)) > max_pos) \ + if (current_pos > max_pos) \ { \ - max_pos = IT_CHARPOS (*(IT)); \ - max_bpos = IT_BYTEPOS (*(IT)); \ + max_pos = current_pos; \ + max_bpos = current_bpos; \ } \ } \ while (0) ------------------------------------------------------------ revno: 105496 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2011-08-19 08:52:18 +0000 message: gnus-art.el (gnus-insert-mime-button, gnus-mime-display-alternative): Make button keymap non-sticky after buttons. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-08-18 22:12:47 +0000 +++ lisp/gnus/ChangeLog 2011-08-19 08:52:18 +0000 @@ -1,3 +1,8 @@ +2011-08-19 Katsumi Yamaoka + + * gnus-art.el (gnus-insert-mime-button, gnus-mime-display-alternative): + Make button keymap non-sticky after buttons. + 2011-08-18 David Engster * nnmairix.el (nnmairix-request-set-mark) === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-08-04 00:58:07 +0000 +++ lisp/gnus/gnus-art.el 2011-08-19 08:52:18 +0000 @@ -5700,7 +5700,8 @@ gnus-callback gnus-mm-display-part gnus-part ,gnus-tmp-id article-type annotation - gnus-data ,handle)) + gnus-data ,handle + rear-nonsticky t)) (setq e (if (bolp) ;; Exclude a newline. (1- (point)) @@ -6013,7 +6014,8 @@ ,gnus-mouse-face-prop ,gnus-article-mouse-face face ,gnus-article-button-face gnus-part ,id - article-type multipart)) + article-type multipart + rear-nonsticky t)) (widget-convert-button 'link from (point) :action 'gnus-widget-press-button :button-keymap gnus-widget-button-keymap) @@ -6037,7 +6039,8 @@ ,gnus-mouse-face-prop ,gnus-article-mouse-face face ,gnus-article-button-face gnus-part ,id - gnus-data ,handle)) + gnus-data ,handle + rear-nonsticky t)) (widget-convert-button 'link from (point) :action 'gnus-widget-press-button :button-keymap gnus-widget-button-keymap) ------------------------------------------------------------ revno: 105495 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-08-18 20:12:45 -0400 message: Adapt themes to new error/warning/success faces. * etc/themes/dichromacy-theme.el: * etc/themes/wheatgrass-theme.el: * etc/themes/tango-theme.el: * etc/themes/tango-dark-theme.el: Add error, warning, and success faces. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-08-16 07:13:02 +0000 +++ etc/ChangeLog 2011-08-19 00:12:45 +0000 @@ -1,3 +1,11 @@ +2011-08-19 Chong Yidong + + * themes/dichromacy-theme.el: + * themes/wheatgrass-theme.el: + * themes/tango-theme.el: + * themes/tango-dark-theme.el: Add error, warning, and success + faces. + 2011-08-15 Carsten Dominik * refcards/orgcard.tex: Document `org-copy-visible'. === modified file 'etc/themes/dichromacy-theme.el' --- etc/themes/dichromacy-theme.el 2011-07-07 01:48:14 +0000 +++ etc/themes/dichromacy-theme.el 2011-08-19 00:12:45 +0000 @@ -60,6 +60,10 @@ ;; Escape and prompt faces `(minibuffer-prompt ((,class (:weight bold :foreground ,blue)))) `(escape-glyph ((,class (:foreground ,vermillion)))) + `(error ((,class (:weight bold :slant italic + :foreground ,vermillion)))) + `(warning ((,class (:foreground ,orange)))) + `(success ((,class (:foreground ,bluegreen)))) ;; Font lock faces `(font-lock-builtin-face ((,class (:foreground ,blue)))) `(font-lock-comment-face ((,class (:slant italic :foreground ,bluegreen)))) @@ -69,8 +73,6 @@ `(font-lock-string-face ((,class (:foreground ,bluegray)))) `(font-lock-type-face ((,class (:weight bold :foreground ,blue)))) `(font-lock-variable-name-face ((,class (:weight bold :foreground ,orange)))) - `(font-lock-warning-face ((,class (:weight bold :slant italic - :foreground ,vermillion)))) ;; Button and link faces `(link ((,class (:underline t :foreground ,blue)))) `(link-visited ((,class (:underline t :foreground ,redpurple)))) === modified file 'etc/themes/tango-dark-theme.el' --- etc/themes/tango-dark-theme.el 2011-07-07 01:48:14 +0000 +++ etc/themes/tango-dark-theme.el 2011-08-19 00:12:45 +0000 @@ -75,6 +75,9 @@ ;; Escape and prompt faces `(minibuffer-prompt ((,class (:foreground ,cham-0)))) `(escape-glyph ((,class (:foreground ,butter-3)))) + `(error ((,class (:foreground ,red-0)))) + `(warning ((,class (:foreground ,orange-1)))) + `(success ((,class (:foreground ,cham-1)))) ;; Font lock faces `(font-lock-builtin-face ((,class (:foreground ,plum-1)))) `(font-lock-comment-face ((,class (:foreground ,cham-2)))) @@ -84,7 +87,6 @@ `(font-lock-string-face ((,class (:foreground ,choc-1)))) `(font-lock-type-face ((,class (:foreground ,blue-0)))) `(font-lock-variable-name-face ((,class (:foreground ,orange-1)))) - `(font-lock-warning-face ((,class (:foreground ,red-0)))) ;; Button and link faces `(link ((,class (:underline t :foreground ,blue-1)))) `(link-visited ((,class (:underline t :foreground ,blue-2)))) === modified file 'etc/themes/tango-theme.el' --- etc/themes/tango-theme.el 2011-07-07 01:48:14 +0000 +++ etc/themes/tango-theme.el 2011-08-19 00:12:45 +0000 @@ -66,6 +66,9 @@ ;; Escape and prompt faces `(minibuffer-prompt ((,class (:weight bold :foreground ,blue-3)))) `(escape-glyph ((,class (:foreground ,red-3)))) + `(error ((,class (:foreground ,red-3)))) + `(warning ((,class (:foreground ,orange-3)))) + `(success ((,class (:foreground ,cham-3)))) ;; Font lock faces `(font-lock-builtin-face ((,class (:foreground ,plum-2)))) `(font-lock-comment-face ((,class (:slant italic :foreground ,alum-5)))) @@ -75,7 +78,6 @@ `(font-lock-string-face ((,class (:foreground ,plum-3)))) `(font-lock-type-face ((,class (:foreground ,blue-3)))) `(font-lock-variable-name-face ((,class (:foreground ,orange-4)))) - `(font-lock-warning-face ((,class (:foreground ,red-2)))) ;; Button and link faces `(link ((,class (:underline t :foreground ,blue-3)))) `(link-visited ((,class (:underline t :foreground ,blue-2)))) === modified file 'etc/themes/wheatgrass-theme.el' --- etc/themes/wheatgrass-theme.el 2011-07-07 01:48:14 +0000 +++ etc/themes/wheatgrass-theme.el 2011-08-19 00:12:45 +0000 @@ -30,6 +30,9 @@ 'wheatgrass `(default ((,class (:foreground "wheat" :background "black")))) `(cursor ((,class (:foreground "black" :background "thistle")))) + `(error ((,class (:foreground "salmon1")))) + `(warning ((,class (:foreground "orange")))) + `(success ((,class (:foreground "yellow green")))) ;; Highlighting faces `(highlight ((,class (:foreground "white" :background "dark green")))) `(region ((,class (:foreground "white" :background "dark green")))) @@ -45,7 +48,6 @@ `(font-lock-string-face ((,class (:foreground "dark khaki")))) `(font-lock-type-face ((,class (:foreground "aquamarine")))) `(font-lock-variable-name-face ((,class (:foreground "yellow green")))) - `(font-lock-warning-face ((,class (:foreground "salmon1")))) ;; Button and link faces `(link ((,class (:underline t :foreground "cyan")))) `(link-visited ((,class (:underline t :foreground "dark cyan")))) ------------------------------------------------------------ revno: 105494 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-08-18 22:12:47 +0000 message: Merge changes made in Gnus trunk. nnmairix.el (nnmairix-request-set-mark, nnmairix-goto-original-article): Remove adding of article to registry, since `gnus-registry-add-group' isn't available anymore. (nnmairix-determine-original-group-from-registry): Use `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't available anymore. gnus-spec.el (gnus-lrm-string): Use 8206 instead of ?\x200e to make things work in Emacs 22 and XEmacs, too. gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): LRM-ify the default From. gnus-spec.el (gnus-lrm-string-p): New macro. (gnus-lrm-string): New constant. (gnus-summary-line-format-spec): LRM-ify the from. (gnus-tilde-max-form): LRM-ify string chopping. gnus-ems.el (gnus-string-mark-left-to-right): New function. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-08-17 22:09:19 +0000 +++ lisp/gnus/ChangeLog 2011-08-18 22:12:47 +0000 @@ -1,5 +1,27 @@ +2011-08-18 David Engster + + * nnmairix.el (nnmairix-request-set-mark) + (nnmairix-goto-original-article): Remove adding of article to registry, + since `gnus-registry-add-group' isn't available anymore. + (nnmairix-determine-original-group-from-registry): Use + `gnus-registry-get-id-key' since `gnus-registry-fetch-groups' isn't + available anymore. + 2011-08-17 Lars Magne Ingebrigtsen + * gnus-spec.el (gnus-lrm-string): Use 8206 instead of ?\x200e to make + things work in Emacs 22 and XEmacs, too. + + * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): LRM-ify the + default From. + + * gnus-spec.el (gnus-lrm-string-p): New macro. + (gnus-lrm-string): New constant. + (gnus-summary-line-format-spec): LRM-ify the from. + (gnus-tilde-max-form): LRM-ify string chopping. + + * gnus-ems.el (gnus-string-mark-left-to-right): New function. + * message.el (message-is-yours-p): Allow disabling canlock checking (bug#9295). (message-shoot-gnksa-feet): Add `canlock-verify'. === modified file 'lisp/gnus/gnus-ems.el' --- lisp/gnus/gnus-ems.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-ems.el 2011-08-18 22:12:47 +0000 @@ -209,6 +209,11 @@ (setq start end end nil)))))) +(defmacro gnus-string-mark-left-to-right (string) + (if (fboundp 'string-mark-left-to-right) + `(string-mark-left-to-right ,string) + string)) + (eval-and-compile ;; XEmacs does not have window-inside-pixel-edges (defalias 'gnus-window-inside-pixel-edges === modified file 'lisp/gnus/gnus-spec.el' --- lisp/gnus/gnus-spec.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/gnus-spec.el 2011-08-18 22:12:47 +0000 @@ -90,6 +90,15 @@ (declare-function gnus-summary-from-or-to-or-newsgroups "gnus-sum" (header gnus-tmp-from)) +(defmacro gnus-lrm-string-p (string) + (if (fboundp 'string-mark-left-to-rigth) + `(eq (aref ,string (1- (length ,string))) 8206) + nil)) + +(defvar gnus-lrm-string (if (ignore-errors (string 8206)) + (propertize (string 8206) 'invisible t) + "")) + (defun gnus-summary-line-format-spec () (insert gnus-tmp-unread gnus-tmp-replied gnus-tmp-score-char gnus-tmp-indentation) @@ -103,7 +112,9 @@ (gnus-summary-from-or-to-or-newsgroups gnus-tmp-header gnus-tmp-from)))) (if (> (length val) 23) - (substring val 0 23) + (if (gnus-lrm-string-p val) + (concat (substring val 0 23) gnus-lrm-string) + (substring val 0 23)) val)) gnus-tmp-closing-bracket)) (point)) @@ -351,13 +362,17 @@ `(if (> (,length-fun ,el) ,max) ,(if (< max-width 0) `(,substring-fun ,el (- (,length-fun ,el) ,max)) - `(,substring-fun ,el 0 ,max)) + `(if (gnus-lrm-string-p ,el) + (concat (,substring-fun ,el 0 ,max) ,gnus-lrm-string) + (,substring-fun ,el 0 ,max))) ,el) `(let ((val (eval ,el))) (if (> (,length-fun val) ,max) ,(if (< max-width 0) `(,substring-fun val (- (,length-fun val) ,max)) - `(,substring-fun val 0 ,max)) + `(if (gnus-lrm-string-p val) + (concat (,substring-fun val 0 ,max) ,gnus-lrm-string) + (,substring-fun val 0 ,max))) val))))) (defun gnus-tilde-cut-form (el cut-width) === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2011-08-06 00:21:29 +0000 +++ lisp/gnus/gnus-sum.el 2011-08-18 22:12:47 +0000 @@ -3709,7 +3709,9 @@ gnus-newsgroup-name)) 'nntp) (gnus-group-real-name gnus-newsgroup-name)))) (concat gnus-summary-newsgroup-prefix newsgroups))))) - (inline (gnus-summary-extract-address-component gnus-tmp-from))))) + (gnus-string-mark-left-to-right + (inline + (gnus-summary-extract-address-component gnus-tmp-from)))))) (defun gnus-summary-insert-line (gnus-tmp-header gnus-tmp-level gnus-tmp-current === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2011-01-25 04:08:28 +0000 +++ lisp/gnus/nnmairix.el 2011-08-18 22:12:47 +0000 @@ -604,9 +604,7 @@ ;; Silence byte-compiler. (defvar gnus-registry-install) -(autoload 'gnus-registry-fetch-group "gnus-registry") -(autoload 'gnus-registry-fetch-groups "gnus-registry") -(autoload 'gnus-registry-add-group "gnus-registry") +(autoload 'gnus-registry-get-id-key "gnus-registry") (deffoo nnmairix-request-set-mark (group actions &optional server) (when server @@ -660,13 +658,7 @@ nnmairix-only-use-registry) (setq ogroup (nnmairix-determine-original-group-from-path - mid nnmairix-current-server)) - ;; if available and allowed, add this entry to the registry - (when (and (boundp 'gnus-registry-install) - gnus-registry-install) - (dolist (cur ogroup) - (unless (gnus-parameter-registry-ignore cur) - (gnus-registry-add-group mid cur))))) + mid nnmairix-current-server))) (unless ogroup (nnheader-message 3 "Unable to set mark: couldn't find original group for %s" mid) @@ -1630,14 +1622,7 @@ ;; registry was not available or did not find article ;; so we search again with mairix in raw mode to get filename (setq allgroups - (nnmairix-determine-original-group-from-path mid server)) - ;; if available and allowed, add this entry to the registry - (when (and (not no-registry) - (boundp 'gnus-registry-install) - gnus-registry-install) - (dolist (cur allgroups) - (unless (gnus-parameter-registry-ignore cur) - (gnus-registry-add-group mid cur))))) + (nnmairix-determine-original-group-from-path mid server))) (if (> (length allgroups) 1) (setq group (gnus-completing-read @@ -1657,7 +1642,7 @@ (set mid (concat "<" mid))) (unless (string-match ">$" mid) (set mid (concat mid ">"))) - (gnus-registry-fetch-groups mid))) + (gnus-registry-get-id-key mid 'group))) (defun nnmairix-determine-original-group-from-path (mid server) "Determine original group(s) for message-id MID from the file path. ------------------------------------------------------------ revno: 105493 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-08-18 16:57:10 -0400 message: Standardize/fix some Org header comments. * org-freemind.el: Remove duplicate, incorrect license notice. * ob-lisp.el: Convert consecutive copyright years to ranges. * ob-js.el, ob-scheme.el: Standardize license text. * ob-R.el, ob-clojure.el, ob-exp.el, ob-lisp.el, ob-lob.el, ob-perl.el: * ob-python.el, ob-ref.el, ob.el: Put multiple authors on separate lines. diff: === modified file 'lisp/org/ob-R.el' --- lisp/org/ob-R.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-R.el 2011-08-18 20:57:10 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. -;; Author: Eric Schulte, Dan Davison +;; Author: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research, R, statistics ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/ob-clojure.el' --- lisp/org/ob-clojure.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-clojure.el 2011-08-18 20:57:10 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. -;; Author: Joel Boehland, Eric Schulte +;; Author: Joel Boehland +;; Eric Schulte ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/ob-exp.el' --- lisp/org/ob-exp.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-exp.el 2011-08-18 20:57:10 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. -;; Author: Eric Schulte, Dan Davison +;; Author: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/ob-js.el' --- lisp/org/ob-js.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-js.el 2011-08-18 20:57:10 +0000 @@ -7,22 +7,20 @@ ;; Homepage: http://orgmode.org ;; Version: 7.7 -;;; License: +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. -;; -;; This program is distributed in the hope that it will be useful, +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. -;; + ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -35,7 +33,7 @@ ;; - a non-browser javascript engine such as node.js http://nodejs.org/ ;; or mozrepl http://wiki.github.com/bard/mozrepl/ -;; +;; ;; - for session based evaluation mozrepl and moz.el are required see ;; http://wiki.github.com/bard/mozrepl/emacs-integration for ;; configuration instructions === modified file 'lisp/org/ob-lisp.el' --- lisp/org/ob-lisp.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-lisp.el 2011-08-18 20:57:10 +0000 @@ -1,8 +1,10 @@ ;;; ob-lisp.el --- org-babel functions for common lisp evaluation -;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. -;; Author: Joel Boehland, Eric Schulte, David T. O'Toole +;; Author: Joel Boehland +;; Eric Schulte +;; David T. O'Toole ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/ob-lob.el' --- lisp/org/ob-lob.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-lob.el 2011-08-18 20:57:10 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. -;; Author: Eric Schulte, Dan Davison +;; Author: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/ob-perl.el' --- lisp/org/ob-perl.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-perl.el 2011-08-18 20:57:10 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2011 Free Software Foundation -;; Author: Dan Davison, Eric Schulte +;; Author: Dan Davison +;; Eric Schulte ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/ob-python.el' --- lisp/org/ob-python.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-python.el 2011-08-18 20:57:10 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2011 Free Software Foundation -;; Author: Eric Schulte, Dan Davison +;; Author: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/ob-ref.el' --- lisp/org/ob-ref.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-ref.el 2011-08-18 20:57:10 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. -;; Author: Eric Schulte, Dan Davison +;; Author: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/ob-scheme.el' --- lisp/org/ob-scheme.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob-scheme.el 2011-08-18 20:57:10 +0000 @@ -7,22 +7,20 @@ ;; Homepage: http://orgmode.org ;; Version: 7.7 -;;; License: +;; This file is part of GNU Emacs. -;; This program is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. -;; -;; This program is distributed in the hope that it will be useful, +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. -;; + ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -35,7 +33,7 @@ ;; - a working scheme implementation ;; (e.g. guile http://www.gnu.org/software/guile/guile.html) -;; +;; ;; - for session based evaluation cmuscheme.el is required which is ;; included in Emacs === modified file 'lisp/org/ob.el' --- lisp/org/ob.el 2011-08-18 20:41:06 +0000 +++ lisp/org/ob.el 2011-08-18 20:57:10 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 2009-2011 Free Software Foundation, Inc. -;; Author: Eric Schulte, Dan Davison +;; Author: Eric Schulte +;; Dan Davison ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org ;; Version: 7.7 === modified file 'lisp/org/org-freemind.el' --- lisp/org/org-freemind.el 2011-08-18 20:41:06 +0000 +++ lisp/org/org-freemind.el 2011-08-18 20:57:10 +0000 @@ -57,26 +57,6 @@ ;; Added y/n question before showing in FreeMind. ;; 2009-11-04: Added support for #+BEGIN_HTML. ;; -;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;; This program is free software; you can redistribute it and/or -;; modify it under the terms of the GNU General Public License as -;; published by the Free Software Foundation; either version 2, or -;; (at your option) any later version. -;; -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. -;; -;; You should have received a copy of the GNU General Public License -;; along with this program; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth -;; Floor, Boston, MA 02110-1301, USA. -;; -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; ;;; Code: (require 'xml) ------------------------------------------------------------ revno: 105492 committer: Glenn Morris branch nick: trunk timestamp: Thu 2011-08-18 16:41:06 -0400 message: Restore clobbered changes to Org copyright years. diff: === modified file 'doc/misc/org.texi' --- doc/misc/org.texi 2011-08-16 07:13:02 +0000 +++ doc/misc/org.texi 2011-08-18 20:41:06 +0000 @@ -265,8 +265,7 @@ @copying This manual is for Org version @value{VERSION}. -Copyright @copyright{} 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -Free Software Foundation, Inc. +Copyright @copyright{} 2004-2011 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document === modified file 'etc/refcards/orgcard.tex' --- etc/refcards/orgcard.tex 2011-08-16 07:13:02 +0000 +++ etc/refcards/orgcard.tex 2011-08-18 20:41:06 +0000 @@ -17,8 +17,8 @@ \pdflayout=(0l) % Nothing else needs to be changed below this line. -% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004, 2005, -% 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +% Copyright (C) 1987, 1993, 1996-1997, 2001-2011 +% Free Software Foundation, Inc. % This file is part of GNU Emacs. === modified file 'lisp/org/ob-C.el' --- lisp/org/ob-C.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-C.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-C.el --- org-babel functions for C and similar languages -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-R.el' --- lisp/org/ob-R.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-R.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-R.el --- org-babel functions for R code evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte, Dan Davison ;; Keywords: literate programming, reproducible research, R, statistics === modified file 'lisp/org/ob-asymptote.el' --- lisp/org/ob-asymptote.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-asymptote.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-asymptote.el --- org-babel functions for asymptote evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-calc.el' --- lisp/org/ob-calc.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-calc.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-calc.el --- org-babel functions for calc code evaluation -;; Copyright (C) 2010 Free Software Foundation, Inc +;; Copyright (C) 2010-2011 Free Software Foundation, Inc ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-clojure.el' --- lisp/org/ob-clojure.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-clojure.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-clojure.el --- org-babel functions for clojure evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Joel Boehland, Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-comint.el' --- lisp/org/ob-comint.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-comint.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-comint.el --- org-babel functions for interaction with comint buffers -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 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 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-css.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-css.el --- org-babel functions for css evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-ditaa.el' --- lisp/org/ob-ditaa.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-ditaa.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-ditaa.el --- org-babel functions for ditaa evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-dot.el' --- lisp/org/ob-dot.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-dot.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-dot.el --- org-babel functions for dot evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 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 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-emacs-lisp.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-emacs-lisp.el --- org-babel functions for emacs-lisp code evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc +;; Copyright (C) 2009-2011 Free Software Foundation, Inc ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-eval.el' --- lisp/org/ob-eval.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-eval.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-eval.el --- org-babel functions for external code evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 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 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-exp.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-exp.el --- Exportation of org-babel source blocks -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte, Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-gnuplot.el' --- lisp/org/ob-gnuplot.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-gnuplot.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-gnuplot.el --- org-babel functions for gnuplot evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-haskell.el' --- lisp/org/ob-haskell.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-haskell.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-haskell.el --- org-babel functions for haskell evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-js.el' --- lisp/org/ob-js.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-js.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-js.el --- org-babel functions for Javascript -;; Copyright (C) 2010 Free Software Foundation +;; Copyright (C) 2010-2011 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, js === modified file 'lisp/org/ob-keys.el' --- lisp/org/ob-keys.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-keys.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-keys.el --- key bindings for org-babel -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-latex.el' --- lisp/org/ob-latex.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-latex.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-latex.el --- org-babel functions for latex "evaluation" -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-ledger.el' --- lisp/org/ob-ledger.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-ledger.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-ledger.el --- org-babel functions for ledger evaluation -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Eric S Fraga ;; Keywords: literate programming, reproducible research, accounting === modified file 'lisp/org/ob-lob.el' --- lisp/org/ob-lob.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-lob.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-lob.el --- functions supporting the Library of Babel -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte, Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-matlab.el' --- lisp/org/ob-matlab.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-matlab.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-matlab.el --- org-babel support for matlab evaluation -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-mscgen.el' --- lisp/org/ob-mscgen.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-mscgen.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-msc.el --- org-babel functions for mscgen evaluation -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Juan Pechiar ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-ocaml.el' --- lisp/org/ob-ocaml.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-ocaml.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-ocaml.el --- org-babel functions for ocaml evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-octave.el' --- lisp/org/ob-octave.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-octave.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-octave.el --- org-babel functions for octave and matlab evaluation -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-org.el' --- lisp/org/ob-org.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-org.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-org.el --- org-babel functions for org code block evaluation -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-perl.el' --- lisp/org/ob-perl.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-perl.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-perl.el --- org-babel functions for perl evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation +;; Copyright (C) 2009-2011 Free Software Foundation ;; Author: Dan Davison, Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-plantuml.el' --- lisp/org/ob-plantuml.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-plantuml.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-plantuml.el --- org-babel functions for plantuml evaluation -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Zhang Weize ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-python.el' --- lisp/org/ob-python.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-python.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-python.el --- org-babel functions for python evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation +;; Copyright (C) 2009-2011 Free Software Foundation ;; Author: Eric Schulte, Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-ref.el' --- lisp/org/ob-ref.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-ref.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-ref.el --- org-babel functions for referencing external data -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte, Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-ruby.el' --- lisp/org/ob-ruby.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-ruby.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-ruby.el --- org-babel functions for ruby evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation +;; Copyright (C) 2009-2011 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-sass.el' --- lisp/org/ob-sass.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-sass.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-sass.el --- org-babel functions for the sass css generation language -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-scheme.el' --- lisp/org/ob-scheme.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-scheme.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-scheme.el --- org-babel functions for Scheme -;; Copyright (C) 2010 Free Software Foundation +;; Copyright (C) 2010-2011 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research, scheme === modified file 'lisp/org/ob-screen.el' --- lisp/org/ob-screen.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-screen.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-screen.el --- org-babel support for interactive terminal -;; Copyright (C) 2009, 2010 Free Software Foundation +;; Copyright (C) 2009-2011 Free Software Foundation ;; Author: Benjamin Andresen ;; Keywords: literate programming, interactive shell === modified file 'lisp/org/ob-sh.el' --- lisp/org/ob-sh.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-sh.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-sh.el --- org-babel functions for shell evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-sql.el' --- lisp/org/ob-sql.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-sql.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-sql.el --- org-babel functions for sql evaluation -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-sqlite.el' --- lisp/org/ob-sqlite.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-sqlite.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-sqlite.el --- org-babel functions for sqlite database interaction -;; Copyright (C) 2010 Free Software Foundation +;; Copyright (C) 2010-2011 Free Software Foundation ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-table.el' --- lisp/org/ob-table.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-table.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-table.el --- support for calling org-babel functions from tables -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob-tangle.el' --- lisp/org/ob-tangle.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob-tangle.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob-tangle.el --- extract source code from org-mode files -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/ob.el' --- lisp/org/ob.el 2011-08-16 07:13:02 +0000 +++ lisp/org/ob.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; ob.el --- working with code blocks in org-mode -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte, Dan Davison ;; Keywords: literate programming, reproducible research === modified file 'lisp/org/org-agenda.el' --- lisp/org/org-agenda.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-agenda.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-agenda.el --- Dynamic task and appointment lists for Org -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-archive.el' --- lisp/org/org-archive.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-archive.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-archive.el --- Archiving for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-ascii.el' --- lisp/org/org-ascii.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-ascii.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-ascii.el --- ASCII export for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-attach.el' --- lisp/org/org-attach.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-attach.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-attach.el --- Manage file attachments to org-mode tasks -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: org data task === modified file 'lisp/org/org-bbdb.el' --- lisp/org/org-bbdb.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-bbdb.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-bbdb.el --- Support for links to BBDB entries from within Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Thomas Baumann === modified file 'lisp/org/org-beamer.el' --- lisp/org/org-beamer.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-beamer.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-beamer.el --- Beamer-specific LaTeX export for org-mode ;; -;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2007-2011 Free Software Foundation, Inc. ;; ;; Version: 7.7 ;; Author: Carsten Dominik === modified file 'lisp/org/org-bibtex.el' --- lisp/org/org-bibtex.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-bibtex.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-bibtex.el --- Org links to BibTeX entries ;; -;; Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 2007-2011 Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry ;; Carsten Dominik === modified file 'lisp/org/org-capture.el' --- lisp/org/org-capture.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-capture.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-capture.el --- Fast note taking in Org-mode -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-clock.el' --- lisp/org/org-clock.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-clock.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-clock.el --- The time clocking code for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-colview.el' --- lisp/org/org-colview.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-colview.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-colview.el --- Column View in Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-compat.el' --- lisp/org/org-compat.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-compat.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-compat.el --- Compatibility code for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-crypt.el' --- lisp/org/org-crypt.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-crypt.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-crypt.el --- Public key encryption for org-mode entries -;; Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc. ;; Emacs Lisp Archive Entry ;; Filename: org-crypt.el === modified file 'lisp/org/org-ctags.el' --- lisp/org/org-ctags.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-ctags.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-ctags.el - Integrate Emacs "tags" facility with org mode. ;; -;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2007-2011 Free Software Foundation, Inc. ;; Author: Paul Sexton ;; Version: 7.7 === modified file 'lisp/org/org-datetree.el' --- lisp/org/org-datetree.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-datetree.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-datetree.el --- Create date entries in a tree -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-docbook.el' --- lisp/org/org-docbook.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-docbook.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-docbook.el --- DocBook exporter for org-mode ;; -;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2007-2011 Free Software Foundation, Inc. ;; ;; Emacs Lisp Archive Entry ;; Filename: org-docbook.el === modified file 'lisp/org/org-docview.el' --- lisp/org/org-docview.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-docview.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-docview.el --- support for links to doc-view-mode buffers -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 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 2011-08-16 07:13:02 +0000 +++ lisp/org/org-entities.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-entities.el --- Support for special entities in Org-mode -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik , ;; Ulf Stegemann === modified file 'lisp/org/org-exp-blocks.el' --- lisp/org/org-exp-blocks.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-exp-blocks.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-exp-blocks.el --- pre-process blocks when exporting org files -;; Copyright (C) 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Version: 7.7 === modified file 'lisp/org/org-exp.el' --- lisp/org/org-exp.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-exp.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-exp.el --- ASCII, HTML, XOXO and iCalendar export for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-faces.el' --- lisp/org/org-faces.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-faces.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-faces.el --- Face definitions for Org-mode. -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-feed.el' --- lisp/org/org-feed.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-feed.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-feed.el --- Add RSS feed items to Org files ;; -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-footnote.el' --- lisp/org/org-footnote.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-footnote.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-footnote.el --- Footnote support in Org and elsewhere ;; -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-freemind.el' --- lisp/org/org-freemind.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-freemind.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-freemind.el --- Export Org files to freemind -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 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 2011-08-16 07:13:02 +0000 +++ lisp/org/org-gnus.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-gnus.el --- Support for links to Gnus groups and messages from within Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Tassilo Horn === modified file 'lisp/org/org-habit.el' --- lisp/org/org-habit.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-habit.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-habit.el --- The habit tracking code for Org-mode -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-html.el' --- lisp/org/org-html.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-html.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-html.el --- HTML export for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-icalendar.el' --- lisp/org/org-icalendar.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-icalendar.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-icalendar.el --- iCalendar export for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-id.el' --- lisp/org/org-id.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-id.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-id.el --- Global identifiers for Org-mode entries ;; -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-indent.el' --- lisp/org/org-indent.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-indent.el 2011-08-18 20:41:06 +0000 @@ -1,5 +1,5 @@ ;;; org-indent.el --- Dynamic indentation for Org-mode -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-info.el' --- lisp/org/org-info.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-info.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-info.el --- Support for links to Info nodes from within Org-Mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-inlinetask.el' --- lisp/org/org-inlinetask.el 2011-07-28 15:13:49 +0000 +++ lisp/org/org-inlinetask.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-inlinetask.el --- Tasks independent of outline hierarchy -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-irc.el' --- lisp/org/org-irc.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-irc.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-irc.el --- Store links to IRC sessions ;; -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; ;; Author: Philip Jackson ;; Keywords: erc, irc, link, org === modified file 'lisp/org/org-jsinfo.el' --- lisp/org/org-jsinfo.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-jsinfo.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-jsinfo.el --- Support for org-info.js Javascript in Org HTML export -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-latex.el' --- lisp/org/org-latex.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-latex.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-latex.el --- LaTeX exporter for org-mode ;; -;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2007-2011 Free Software Foundation, Inc. ;; ;; Emacs Lisp Archive Entry ;; Filename: org-latex.el === modified file 'lisp/org/org-list.el' --- lisp/org/org-list.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-list.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-list.el --- Plain lists for Org-mode ;; -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry === modified file 'lisp/org/org-mac-message.el' --- lisp/org/org-mac-message.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-mac-message.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-mac-message.el --- Links to Apple Mail.app messages from within Org-mode -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; Author: John Wiegley ;; Christopher Suckling === modified file 'lisp/org/org-macs.el' --- lisp/org/org-macs.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-macs.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-macs.el --- Top-level definitions for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mew.el' --- lisp/org/org-mew.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-mew.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-mew.el --- Support for links to Mew messages from within Org-mode -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; Author: Tokuya Kameshima ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mhe.el' --- lisp/org/org-mhe.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-mhe.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-mhe.el --- Support for links to MH-E messages from within Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Thomas Baumann ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mks.el' --- lisp/org/org-mks.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-mks.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-mks.el --- Multi-key-selection for Org-mode -;; Copyright (C) 2010 Free Software Foundation, Inc. +;; Copyright (C) 2010-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mobile.el' --- lisp/org/org-mobile.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-mobile.el 2011-08-18 20:41:06 +0000 @@ -1,5 +1,5 @@ ;;; org-mobile.el --- Code for asymmetric sync with a mobile device -;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2009-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-mouse.el' --- lisp/org/org-mouse.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-mouse.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-mouse.el --- Better mouse support for org-mode -;; Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation +;; Copyright (C) 2006-2011 Free Software Foundation ;; ;; Author: Piotr Zielinski ;; Maintainer: Carsten Dominik === modified file 'lisp/org/org-plot.el' --- lisp/org/org-plot.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-plot.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-plot.el --- Support for plotting from Org-mode -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; ;; Author: Eric Schulte ;; Keywords: tables, plotting === modified file 'lisp/org/org-protocol.el' --- lisp/org/org-protocol.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-protocol.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-protocol.el --- Intercept calls from emacsclient to trigger custom actions. ;; -;; Copyright (C) 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; ;; Author: Bastien Guerry ;; Author: Daniel M German === modified file 'lisp/org/org-publish.el' --- lisp/org/org-publish.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-publish.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,5 @@ ;;; org-publish.el --- publish related org-mode files as a website -;; Copyright (C) 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2006-2011 Free Software Foundation, Inc. ;; Author: David O'Toole ;; Maintainer: Carsten Dominik === modified file 'lisp/org/org-remember.el' --- lisp/org/org-remember.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-remember.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-remember.el --- Fast note taking in Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-rmail.el' --- lisp/org/org-rmail.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-rmail.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-rmail.el --- Support for links to Rmail messages from within Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-src.el' --- lisp/org/org-src.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-src.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-src.el --- Source code examples in Org ;; -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Bastien Guerry === modified file 'lisp/org/org-table.el' --- lisp/org/org-table.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-table.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-table.el --- The table editor for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-taskjuggler.el' --- lisp/org/org-taskjuggler.el 2011-07-28 15:13:49 +0000 +++ lisp/org/org-taskjuggler.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-taskjuggler.el --- TaskJuggler exporter for org-mode ;; -;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2007-2011 Free Software Foundation, Inc. ;; ;; Emacs Lisp Archive Entry ;; Filename: org-taskjuggler.el === modified file 'lisp/org/org-timer.el' --- lisp/org/org-timer.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-timer.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-timer.el --- The relative timer code for Org-mode -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-vm.el' --- lisp/org/org-vm.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-vm.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-vm.el --- Support for links to VM messages from within Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-w3m.el' --- lisp/org/org-w3m.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-w3m.el 2011-08-18 20:41:06 +0000 @@ -1,6 +1,6 @@ ;;; org-w3m.el --- Support from copy and paste from w3m to Org-mode -;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2008-2011 Free Software Foundation, Inc. ;; Author: Andy Stewart ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org-wl.el' --- lisp/org/org-wl.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-wl.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-wl.el --- Support for links to Wanderlust messages from within Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Tokuya Kameshima ;; David Maus === modified file 'lisp/org/org-xoxo.el' --- lisp/org/org-xoxo.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org-xoxo.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org-xoxo.el --- XOXO export for Org-mode -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp === modified file 'lisp/org/org.el' --- lisp/org/org.el 2011-08-16 07:13:02 +0000 +++ lisp/org/org.el 2011-08-18 20:41:06 +0000 @@ -1,7 +1,6 @@ ;;; org.el --- Outline-based notes management and organizer ;; Carstens outline-mode for keeping track of everything. -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 -;; Free Software Foundation, Inc. +;; Copyright (C) 2004-2011 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik ;; Keywords: outlines, hypermedia, calendar, wp ------------------------------------------------------------ revno: 105491 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-08-18 21:46:02 +0300 message: Protect the bidi iterator against zero bidi properties. src/bidi.c (bidi_get_type): If bidi_type_table reports zero as the character bidirectional type, use STRONG_L instead. Fixes crashes in a buffer produced by `describe-categories'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-08-18 16:09:40 +0000 +++ src/ChangeLog 2011-08-18 18:46:02 +0000 @@ -1,5 +1,9 @@ 2011-08-18 Eli Zaretskii + * bidi.c (bidi_get_type): If bidi_type_table reports zero as the + character bidirectional type, use STRONG_L instead. Fixes crashes + in a buffer produced by `describe-categories'. + * dispextern.h (struct bidi_it): Move disp_pos and disp_prop_p members before the level stack, so they would be saved and restored when copying iterator state. Fixes incorrect reordering === modified file 'src/bidi.c' --- src/bidi.c 2011-08-15 18:54:18 +0000 +++ src/bidi.c 2011-08-18 18:46:02 +0000 @@ -108,6 +108,8 @@ abort (); default_type = (bidi_type_t) XINT (CHAR_TABLE_REF (bidi_type_table, ch)); + if (default_type == 0) + default_type = STRONG_L; if (override == NEUTRAL_DIR) return default_type; ------------------------------------------------------------ revno: 105490 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-08-18 19:27:59 +0300 message: Rename string-mark-left-to-right to bidi-string-mark-left-to-right in the manual. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-08-18 10:53:55 +0000 +++ doc/lispref/ChangeLog 2011-08-18 16:27:59 +0000 @@ -6,9 +6,10 @@ * display.texi (Bidirectional Display): Document the pitfalls of concatenating strings with bidirectional content, with possible - solutions. Document string-mark-left-to-right. Mention paragraph - direction in modes that inherit from prog-mode. Document use of - `bidi-class' and `mirroring' properties as part of reordering. + solutions. Document bidi-string-mark-left-to-right. Mention + paragraph direction in modes that inherit from prog-mode. + Document use of `bidi-class' and `mirroring' properties as part of + reordering. 2011-08-16 Eli Zaretskii === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-08-18 10:53:55 +0000 +++ doc/lispref/display.texi 2011-08-18 16:27:59 +0000 @@ -6132,8 +6132,8 @@ Append the special character @code{U+200E}, LEFT-TO-RIGHT MARK, or @acronym{LRM}, to the end of each field that may have bidirectional content, or prepend it to the beginning of the following field. The -function @code{string-mark-left-to-right}, described below, comes in -handy for this purpose. (In a right-to-left paragraph, use +function @code{bidi-string-mark-left-to-right}, described below, comes +in handy for this purpose. (In a right-to-left paragraph, use @code{U+200F}, RIGHT-TO-LEFT MARK, or @acronym{RLM}, instead.) This is one of the solutions recommended by @uref{http://www.unicode.org/reports/tr9/#Separators, the @@ -6146,7 +6146,7 @@ thus reorder them separately. @end itemize -@defun string-mark-left-to-right string +@defun bidi-string-mark-left-to-right string This subroutine returns its argument @var{string}, possibly modified, such that the result can be safely concatenated with another string, or juxtaposed with another string in a buffer, without disrupting the ------------------------------------------------------------ revno: 105489 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-08-18 19:09:40 +0300 message: Fix bidi reordering around TAB characters covered by display properties. src/dispextern.h (struct bidi_it): Move disp_pos and disp_prop_p members before the level stack, so they would be saved and restored when copying iterator state. Fixes incorrect reordering around TABs covered by display properties. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-08-18 15:33:22 +0000 +++ src/ChangeLog 2011-08-18 16:09:40 +0000 @@ -1,3 +1,10 @@ +2011-08-18 Eli Zaretskii + + * dispextern.h (struct bidi_it): Move disp_pos and disp_prop_p + members before the level stack, so they would be saved and + restored when copying iterator state. Fixes incorrect reordering + around TABs covered by display properties. + 2011-08-18 Andreas Schwab * process.c (Fnetwork_interface_list): Correctly determine buffer === modified file 'src/dispextern.h' --- src/dispextern.h 2011-08-15 17:47:25 +0000 +++ src/dispextern.h 2011-08-18 16:09:40 +0000 @@ -1859,6 +1859,9 @@ EMACS_INT ignore_bn_limit; /* position until which to ignore BNs */ bidi_dir_t sor; /* direction of start-of-run in effect */ int scan_dir; /* direction of text scan, 1: forw, -1: back */ + EMACS_INT disp_pos; /* position of display string after ch */ + int disp_prop_p; /* if non-zero, there really is a + `display' property/string at disp_pos */ int stack_idx; /* index of current data on the stack */ /* Note: Everything from here on is not copied/saved when the bidi iterator state is saved, pushed, or popped. So only put here @@ -1867,9 +1870,6 @@ struct bidi_string_data string; /* string to reorder */ bidi_dir_t paragraph_dir; /* current paragraph direction */ EMACS_INT separator_limit; /* where paragraph separator should end */ - EMACS_INT disp_pos; /* position of display string after ch */ - int disp_prop_p; /* if non-zero, there really is a - `display' property/string at disp_pos */ unsigned first_elt : 1; /* if non-zero, examine current char first */ unsigned new_paragraph : 1; /* if non-zero, we expect a new paragraph */ unsigned frame_window_p : 1; /* non-zero if displaying on a GUI frame */ ------------------------------------------------------------ revno: 105488 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-08-18 11:53:29 -0400 message: Add L and R categories to standard category table, and use them. * lisp/international/characters.el: Add L and R categories. * lisp/subr.el (bidi-string-mark-left-to-right): Rename from string-mark-left-to-right. Use category search. * lisp/buff-menu.el (Buffer-menu-buffer+size): Callers changed. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-08-18 11:36:19 +0000 +++ etc/NEWS 2011-08-18 15:53:29 +0000 @@ -1047,15 +1047,16 @@ declared as dynamically bound. +++ -** New function `string-mark-left-to-right'. +** New function `bidi-string-mark-left-to-right'. Given a string containing right-to-left (RTL) script, this function -returns another string with a terminating LRM (left-to-right mark) -character. If this string is inserted into a buffer, Emacs treats the -LRM as the end of an RTL segment and displays following text as LTR. +returns another string which can be safely inserted into a buffer as a +distinct RTL "segment", without causing any following text to be +displayed as RTL. (This is done by appending a Unicode "left-to-right +mark" character.) This is useful when the buffer has overall left-to-right (LTR) -paragraph direction and you need to insert a string whose contents -(and hence directionality) are not known in advance. +paragraph direction and you need to insert a string whose contents and +directionality are not known in advance. ** pre/post-command-hook are not reset to nil upon error. Instead, the offending function is removed. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-08-18 11:36:19 +0000 +++ lisp/ChangeLog 2011-08-18 15:53:29 +0000 @@ -1,3 +1,12 @@ +2011-08-18 Chong Yidong + + * international/characters.el: Add L and R categories. + + * subr.el (bidi-string-mark-left-to-right): Rename from + string-mark-left-to-right. Use category search. + + * buff-menu.el (Buffer-menu-buffer+size): Callers changed. + 2011-08-18 Juri Linkov * faces.el (error, warning, success): New faces with definitions === modified file 'lisp/buff-menu.el' --- lisp/buff-menu.el 2011-08-10 19:03:56 +0000 +++ lisp/buff-menu.el 2011-08-18 15:53:29 +0000 @@ -681,9 +681,9 @@ (string-width tail) 2)) Buffer-menu-short-ellipsis - (string-mark-left-to-right tail)))) + (bidi-string-mark-left-to-right tail)))) ;; Don't put properties on (buffer-name). - (setq name (string-mark-left-to-right name))) + (setq name (bidi-string-mark-left-to-right name))) (add-text-properties 0 (length name) name-props name) (add-text-properties 0 (length size) size-props size) (let ((name+space-width (- Buffer-menu-buffer+size-width === modified file 'lisp/emacs-lisp/tabulated-list.el' --- lisp/emacs-lisp/tabulated-list.el 2011-08-10 19:03:56 +0000 +++ lisp/emacs-lisp/tabulated-list.el 2011-08-18 15:53:29 +0000 @@ -283,7 +283,7 @@ (> (length label) width) (setq label (concat (substring label 0 (- width 3)) "..."))) - (setq label (string-mark-left-to-right label)) + (setq label (bidi-string-mark-left-to-right label)) (if (stringp desc) (insert (propertize label 'help-echo help-echo)) (apply 'insert-text-button label (cdr desc))) === modified file 'lisp/international/characters.el' --- lisp/international/characters.el 2011-07-06 22:43:48 +0000 +++ lisp/international/characters.el 2011-08-18 15:53:29 +0000 @@ -114,6 +114,16 @@ Base characters (Unicode General Category L,N,P,S,Zs)") (define-category ?^ "Combining Combining diacritic or mark (Unicode General Category M)") + +;; bidi types +(define-category ?R "Right-to-left (strong) +Characters with \"strong\" right-to-left directionality, i.e. +with R, AL, RLE, or RLO Unicode bidi character type.") + +(define-category ?L "Left-to-right (strong) +Characters with \"strong\" left-to-right directionality, i.e. +with L, LRE, or LRO Unicode bidi character type.") + ;;; Setting syntax and category. @@ -478,6 +488,16 @@ (modify-category-entry x category)) chars))))) +;; Bidi categories + +(map-char-table (lambda (key val) + (cond + ((memq val '(R AL RLO RLE)) + (modify-category-entry key ?R)) + ((memq val '(L LRE LRO)) + (modify-category-entry key ?L)))) + (unicode-property-table-internal 'bidi-class)) + ;; Latin (modify-category-entry '(#x80 . #x024F) ?l) === modified file 'lisp/subr.el' --- lisp/subr.el 2011-08-12 15:43:30 +0000 +++ lisp/subr.el 2011-08-18 15:53:29 +0000 @@ -3539,30 +3539,23 @@ (eq t (compare-strings str1 nil nil str2 0 (length str1) ignore-case))) -(defun string-mark-left-to-right (str) +(defun bidi-string-mark-left-to-right (str) "Return a string that can be safely inserted in left-to-right text. -If STR contains right-to-left (RTL) script, return a string -consisting of STR followed by a terminating invisible -left-to-right mark (LRM) character. - -The LRM character marks the end of an RTL segment, and resets the -display direction of any subsequent text to left-to-right. -\(Otherwise, some of that text might be displayed as part of the -RTL segment, based on the bidirectional display algorithm.) - -If STR contains no RTL characters, return STR." + +Normally, inserting a string with right-to-left (RTL) script into +a buffer may cause some subsequent text to be displayed as part +of the RTL segment (usually this affects punctuation characters). +This function returns a string which displays as STR but forces +subsequent text to be displayed as left-to-right. + +If STR contains any RTL character, this function returns a string +consisting of STR followed by an invisible left-to-right mark +\(LRM) character. Otherwise, it returns STR." (unless (stringp str) (signal 'wrong-type-argument (list 'stringp str))) - (let ((len (length str)) - (n 0) - rtl-found) - (while (and (not rtl-found) (< n len)) - (setq rtl-found (memq (get-char-code-property - (aref str n) 'bidi-class) '(R AL RLO)) - n (1+ n))) - (if rtl-found - (concat str (propertize (string ?\x200e) 'invisible t)) - str))) + (if (string-match "\\cR" str) + (concat str (propertize (string ?\x200e) 'invisible t)) + str)) ;;;; invisibility specs ------------------------------------------------------------ revno: 105487 committer: Andreas Schwab branch nick: emacs timestamp: Thu 2011-08-18 17:33:22 +0200 message: * src/process.c (Fnetwork_interface_list): Correctly determine buffer size. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-08-17 21:40:13 +0000 +++ src/ChangeLog 2011-08-18 15:33:22 +0000 @@ -1,3 +1,8 @@ +2011-08-18 Andreas Schwab + + * process.c (Fnetwork_interface_list): Correctly determine buffer + size. + 2011-08-17 Chong Yidong * eval.c (internal_condition_case, internal_condition_case_1) === modified file 'src/process.c' --- src/process.c 2011-08-14 17:51:08 +0000 +++ src/process.c 2011-08-18 15:33:22 +0000 @@ -3580,38 +3580,57 @@ if (s < 0) return Qnil; - again: - buf_size *= 2; - buf = xrealloc(buf, buf_size); - if (!buf) - { - close (s); - return Qnil; - } - - ifconf.ifc_buf = buf; - if (ioctl (s, SIOCGIFCONF, &ifconf)) - { - close (s); - xfree (buf); - return Qnil; - } - - if (ifconf.ifc_len == buf_size) - goto again; + ifconf.ifc_buf = 0; + ifconf.ifc_len = 0; + if (ioctl (s, SIOCGIFCONF, &ifconf) == 0 && ifconf.ifc_len > 0) + { + ifconf.ifc_buf = xmalloc (ifconf.ifc_len); + if (ifconf.ifc_buf == NULL) + { + close (s); + return Qnil; + } + if (ioctl (s, SIOCGIFCONF, &ifconf)) + { + close (s); + xfree (ifconf.ifc_buf); + return Qnil; + } + } + else + do + { + buf_size *= 2; + buf = xrealloc (buf, buf_size); + if (!buf) + { + close (s); + return Qnil; + } + + ifconf.ifc_buf = buf; + ifconf.ifc_len = buf_size; + if (ioctl (s, SIOCGIFCONF, &ifconf)) + { + close (s); + xfree (buf); + return Qnil; + } + + } + while (ifconf.ifc_len == buf_size); close (s); res = Qnil; - for (ifreq = ifconf.ifc_req; - (char *) ifreq < (char *) (ifconf.ifc_req) + ifconf.ifc_len; - ) + ifreq = ifconf.ifc_req; + while ((char *) ifreq < (char *) ifconf.ifc_req + ifconf.ifc_len) { struct ifreq *ifq = ifreq; #ifdef HAVE_STRUCT_IFREQ_IFR_ADDR_SA_LEN -#define SIZEOF_IFREQ(sif) \ - ((sif)->ifr_addr.sa_len < sizeof(struct sockaddr) ? \ - sizeof((*sif)) : sizeof ((sif)->ifr_name) + sif->ifr_addr.sa_len) +#define SIZEOF_IFREQ(sif) \ + ((sif)->ifr_addr.sa_len < sizeof (struct sockaddr) \ + ? sizeof (*(sif)) : sizeof ((sif)->ifr_name) + (sif)->ifr_addr.sa_len) int len = SIZEOF_IFREQ (ifq); #else @@ -3619,7 +3638,7 @@ #endif char namebuf[sizeof (ifq->ifr_name) + 1]; i += len; - ifreq = (struct ifreq*) ((char*) ifreq + len); + ifreq = (struct ifreq *) ((char *) ifreq + len); if (ifq->ifr_addr.sa_family != AF_INET) continue; ------------------------------------------------------------ revno: 105486 fixes bug(s): http://debbugs.gnu.org/6117 committer: Juri Linkov branch nick: trunk timestamp: Thu 2011-08-18 14:36:19 +0300 message: * lisp/faces.el (error, warning, success): New faces with definitions copied from old default values of `font-lock-warning-face', `compilation-warning', `compilation-info'. * lisp/font-lock.el (font-lock-warning-face): Inherit from `error'. * lisp/progmodes/compile.el (compilation-error): Inherit from `error'. (compilation-warning): Inherit from `warning'. (compilation-info): Inherit from `success'. * lisp/dired.el (dired-marked): Inherit from `warning'. (dired-flagged): Inherit from `error'. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-08-18 10:53:55 +0000 +++ etc/NEWS 2011-08-18 11:36:19 +0000 @@ -234,6 +234,9 @@ See the Emacs Lisp Reference Manual for more information. +** New basic faces `error', `warning', `success' are available to +highlight strings that indicate failure, caution or successful operation. + ** The colors for selected text (the region face) are taken from the GTK theme when Emacs is built with GTK. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-08-17 22:02:49 +0000 +++ lisp/ChangeLog 2011-08-18 11:36:19 +0000 @@ -1,3 +1,18 @@ +2011-08-18 Juri Linkov + + * faces.el (error, warning, success): New faces with definitions + copied from old default values of `font-lock-warning-face', + `compilation-warning', `compilation-info' (bug#6117). + + * font-lock.el (font-lock-warning-face): Inherit from `error'. + + * progmodes/compile.el (compilation-error): Inherit from `error'. + (compilation-warning): Inherit from `warning'. + (compilation-info): Inherit from `success'. + + * dired.el (dired-marked): Inherit from `warning'. + (dired-flagged): Inherit from `error'. + 2011-08-17 Lars Magne Ingebrigtsen * mail/smtpmail.el (auth-source): Require to avoid problems with === modified file 'lisp/dired.el' --- lisp/dired.el 2011-08-04 00:58:07 +0000 +++ lisp/dired.el 2011-08-18 11:36:19 +0000 @@ -342,7 +342,7 @@ "Face name used for dired marks.") (defface dired-marked - '((t (:inherit font-lock-warning-face))) + '((t (:inherit warning))) "Face used for marked files." :group 'dired-faces :version "22.1") @@ -350,7 +350,7 @@ "Face name used for marked files.") (defface dired-flagged - '((t (:inherit font-lock-variable-name-face))) + '((t (:inherit error))) "Face used for files flagged for deletion." :group 'dired-faces :version "22.1") === modified file 'lisp/faces.el' --- lisp/faces.el 2011-08-07 14:14:54 +0000 +++ lisp/faces.el 2011-08-18 11:36:19 +0000 @@ -2413,6 +2413,39 @@ It is used for characters of no fonts too." :version "24.1" :group 'basic-faces) + +(defface error + '((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold)) + (((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold)) + (((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold)) + (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold)) + (((class color) (min-colors 8)) (:foreground "red")) + (t (:inverse-video t :weight bold))) + "Basic face used to highlight errors and to denote failure." + :version "24.1" + :group 'basic-faces) + +(defface warning + '((((class color) (min-colors 16)) (:foreground "DarkOrange" :weight bold)) + (((class color)) (:foreground "yellow" :weight bold)) + (t (:weight bold))) + "Basic face used to highlight warnings." + :version "24.1" + :group 'basic-faces) + +(defface success + '((((class color) (min-colors 16) (background light)) + (:foreground "Green3" :weight bold)) + (((class color) (min-colors 88) (background dark)) + (:foreground "Green1" :weight bold)) + (((class color) (min-colors 16) (background dark)) + (:foreground "Green" :weight bold)) + (((class color)) (:foreground "green" :weight bold)) + (t (:weight bold))) + "Basic face used to indicate successful operation." + :version "24.1" + :group 'basic-faces) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Manipulating font names. === modified file 'lisp/font-lock.el' --- lisp/font-lock.el 2011-07-14 13:50:25 +0000 +++ lisp/font-lock.el 2011-08-18 11:36:19 +0000 @@ -1959,12 +1959,7 @@ :group 'font-lock-faces) (defface font-lock-warning-face - '((((class color) (min-colors 88) (background light)) (:foreground "Red1" :weight bold)) - (((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold)) - (((class color) (min-colors 16) (background light)) (:foreground "Red1" :weight bold)) - (((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold)) - (((class color) (min-colors 8)) (:foreground "red")) - (t (:inverse-video t :weight bold))) + '((t :inherit error)) "Font Lock mode face used to highlight warnings." :group 'font-lock-faces) === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2011-07-12 14:40:56 +0000 +++ lisp/progmodes/compile.el 2011-08-18 11:36:19 +0000 @@ -647,19 +647,19 @@ (defvar compile-history nil) (defface compilation-error - '((t :inherit font-lock-warning-face)) + '((t :inherit error)) "Face used to highlight compiler errors." :group 'compilation :version "22.1") (defface compilation-warning - '((t :inherit font-lock-variable-name-face)) + '((t :inherit warning)) "Face used to highlight compiler warnings." :group 'compilation :version "22.1") (defface compilation-info - '((t :inherit font-lock-type-face)) + '((t :inherit success)) "Face used to highlight compiler information." :group 'compilation :version "22.1") ------------------------------------------------------------ revno: 105485 committer: Eli Zaretskii branch nick: trunk timestamp: Thu 2011-08-18 13:53:55 +0300 message: Improve documentation of bidi in ELisp manual. doc/lispref/nonascii.texi (Character Properties): Document use of `bidi-class' and `mirroring' properties as part of reordering. Provide cross-references to "Bidirectional Display". doc/lispref/display.texi (Bidirectional Display): Document the pitfalls of concatenating strings with bidirectional content, with possible solutions. Document string-mark-left-to-right. Mention paragraph direction in modes that inherit from prog-mode. Document use of `bidi-class' and `mirroring' properties as part of reordering. etc/NEWS: Mark string-mark-left-to-right as documented. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-08-16 08:40:31 +0000 +++ doc/lispref/ChangeLog 2011-08-18 10:53:55 +0000 @@ -1,3 +1,15 @@ +2011-08-18 Eli Zaretskii + + * nonascii.texi (Character Properties): Document use of + `bidi-class' and `mirroring' properties as part of reordering. + Provide cross-references to "Bidirectional Display". + + * display.texi (Bidirectional Display): Document the pitfalls of + concatenating strings with bidirectional content, with possible + solutions. Document string-mark-left-to-right. Mention paragraph + direction in modes that inherit from prog-mode. Document use of + `bidi-class' and `mirroring' properties as part of reordering. + 2011-08-16 Eli Zaretskii * modes.texi (Major Mode Conventions): Improve the documentation === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-08-09 21:14:11 +0000 +++ doc/lispref/display.texi 2011-08-18 10:53:55 +0000 @@ -5992,6 +5992,7 @@ for editing and displaying bidirectional text. @cindex logical order +@cindex reading order @cindex visual order @cindex unicode bidirectional algorithm Emacs stores right-to-left and bidirectional text in the so-called @@ -6006,17 +6007,16 @@ a ``Full bidirectionality'' class implementation of the @acronym{UBA}. @defvar bidi-display-reordering - The buffer-local variable @code{bidi-display-reordering} controls -whether text in the buffer is reordered for display. If its value is -non-@code{nil}, Emacs reorders characters that have right-to-left -directionality when they are displayed. The default value is -@code{t}. Text in overlay strings (@pxref{Overlay -Properties,,before-string}), display strings (@pxref{Overlay -Properties,,display}), and @code{display} text properties -(@pxref{Display Property}) is also reordered if the buffer whose text -includes these strings is reordered for display. Turning off -@code{bidi-display-reordering} for a buffer turns off reordering of -all the overlay and display strings in that buffer. + This buffer-local variable controls whether text in the buffer is +reordered for display. If its value is non-@code{nil}, Emacs reorders +characters that have right-to-left directionality when they are +displayed. The default value is @code{t}. Text in overlay strings +(@pxref{Overlay Properties,,before-string}), display strings +(@pxref{Overlay Properties,,display}), and @code{display} text +properties (@pxref{Display Property}) is also reordered for display if +the buffer whose text includes these strings is reordered. Turning +off @code{bidi-display-reordering} for a buffer turns off reordering +of all the overlay and display strings in that buffer. Reordering of strings that are unrelated to any buffer, such as text displayed on the mode line (@pxref{Mode Line Format}) or header line @@ -6056,7 +6056,7 @@ covered by these properties is reordered together. Moreover, the bidirectional properties of the characters in this chunk of text are ignored, and Emacs reorders them as if they were replaced with a -single character @code{u+FFFC}, known as the @dfn{Object Replacement +single character @code{U+FFFC}, known as the @dfn{Object Replacement Character}. This means that placing a display property over a portion of text may change the way that the surrounding text is reordered for display. To prevent this unexpected effect, always place such @@ -6073,9 +6073,9 @@ margin. @defvar bidi-paragraph-direction - Emacs determines the base direction of each paragraph dynamically, -based on the text at the beginning of the paragraph. The precise -method of determining the base direction is specified by the + By default, Emacs determines the base direction of each paragraph +dynamically, based on the text at the beginning of the paragraph. The +precise method of determining the base direction is specified by the @acronym{UBA}; in a nutshell, the first character in a paragraph that has an explicit directionality determines the base direction of the paragraph. However, sometimes a buffer may need to force a certain @@ -6087,6 +6087,13 @@ paragraphs in the buffer to have the direction specified by its buffer-local value. The value can be either @code{right-to-left} or @code{left-to-right}. Any other value is interpreted as @code{nil}. +The default is @code{nil}. + +@cindex @code{prog-mode}, and @code{bidi-paragraph-direction} +Modes that are meant to display program source code should force a +@code{left-to-right} paragraph direction. The easiest way of doing so +is to derive the mode from Prog Mode, which already sets +@code{bidi-paragraph-direction} to that value. @end defvar @defun current-bidi-paragraph-direction &optional buffer @@ -6099,3 +6106,70 @@ otherwise, the returned value reflects the paragraph direction determined dynamically by Emacs. @end defun + +@cindex layout on display, and bidirectional text +@cindex jumbled display of bidirectional text +@cindex concatenating bidirectional strings + Reordering of bidirectional text for display can have surprising and +unpleasant effects when two strings with bidirectional content are +juxtaposed in a buffer, or otherwise programmatically concatenated +into a string of text. A typical example is a buffer whose lines are +actually sequences of items, or fields, separated by whitespace or +punctuation characters. This is used in specialized modes such as +Buffer-menu Mode or various email summary modes, like Rmail Summary +Mode. Because these separator characters are @dfn{weak}, i.e.@: have +no strong directionality, they take on the directionality of +surrounding text. As result, a numeric field that follows a field +with bidirectional content can be displayed @emph{to the left} of the +preceding field, producing a jumbled display and messing up the +expected layout. + + To countermand this, you can use one of the following techniques for +forcing correct order of fields on display: + +@itemize @minus +@item +Append the special character @code{U+200E}, LEFT-TO-RIGHT MARK, or +@acronym{LRM}, to the end of each field that may have bidirectional +content, or prepend it to the beginning of the following field. The +function @code{string-mark-left-to-right}, described below, comes in +handy for this purpose. (In a right-to-left paragraph, use +@code{U+200F}, RIGHT-TO-LEFT MARK, or @acronym{RLM}, instead.) This +is one of the solutions recommended by +@uref{http://www.unicode.org/reports/tr9/#Separators, the +@acronym{UBA}}. + +@item +Include the tab character in the field separator. The tab character +plays the role of @dfn{segment separator} in the @acronym{UBA} +reordering, whose effect is to make each field a separate segment, and +thus reorder them separately. +@end itemize + +@defun string-mark-left-to-right string +This subroutine returns its argument @var{string}, possibly modified, +such that the result can be safely concatenated with another string, +or juxtaposed with another string in a buffer, without disrupting the +relative layout of this string and the next one on display. If the +string returned by this function is displayed as part of a +left-to-right paragraph, it will always appear on display to the left +of the text that follows it. The function works by examining the +characters of its argument, and if any of those characters could cause +reordering on display, the function appends the @acronym{LRM} +character to the string. The appended @acronym{LRM} character is made +@emph{invisible} (@pxref{Invisible Text}), to hide it on display. +@end defun + + The reordering algorithm uses the bidirectional properties of the +characters stored as their @code{bidi-class} property +(@pxref{Character Properties}). Lisp programs can change these +properties by calling the @code{put-char-code-property} function. +However, doing this requires a thorough understanding of the +@acronym{UBA}, and is therefore not recommended. Any changes to the +bidirectional properties of a character have global effect: they +affect all Emacs frames and windows. + + Similarly, the @code{mirroring} property is used to display the +appropriate mirrored character in the reordered text. Lisp programs +can affect the mirrored display by changing this property. Again, any +such changes affect all of Emacs display. === modified file 'doc/lispref/nonascii.texi' --- doc/lispref/nonascii.texi 2011-08-16 08:26:46 +0000 +++ doc/lispref/nonascii.texi 2011-08-18 10:53:55 +0000 @@ -392,7 +392,8 @@ @item bidi-class Corresponds to the Unicode @code{Bidi_Class} property. The value is a symbol whose name is the Unicode @dfn{directional type} of the -character. +character. Emacs uses this property when it reorders bidirectional +text for display (@pxref{Bidirectional Display}). @item decomposition Corresponds to the Unicode @code{Decomposition_Type} and @@ -440,7 +441,9 @@ property is @code{N} have @code{nil} as their @code{mirroring} property; however, some characters whose @code{mirrored} property is @code{Y} also have @code{nil} for @code{mirroring}, because no -appropriate characters exist with mirrored glyphs. +appropriate characters exist with mirrored glyphs. Emacs uses this +property to display mirror images of characters when appropriate +(@pxref{Bidirectional Display}). @item old-name Corresponds to the Unicode @code{Unicode_1_Name} property. The value === modified file 'etc/NEWS' --- etc/NEWS 2011-08-16 02:29:15 +0000 +++ etc/NEWS 2011-08-18 10:53:55 +0000 @@ -1043,6 +1043,7 @@ *** New function `special-variable-p' to check whether a variable is declared as dynamically bound. ++++ ** New function `string-mark-left-to-right'. Given a string containing right-to-left (RTL) script, this function returns another string with a terminating LRM (left-to-right mark) ------------------------------------------------------------ revno: 105484 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-08-17 22:09:19 +0000 message: Merge changes made in Gnus trunk. message.el (message-is-yours-p): Allow disabling canlock checking (bug#9295). (message-shoot-gnksa-feet): Add `canlock-verify'. (message-auto-save-directory): Use ~/ as the auto-save directory if the message directory isn't writable (bug#9304). auth-source.el (auth-source-netrc-saver): Make the .authinfo file non-world-readable. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-08-17 00:10:46 +0000 +++ lisp/gnus/ChangeLog 2011-08-17 22:09:19 +0000 @@ -1,3 +1,14 @@ +2011-08-17 Lars Magne Ingebrigtsen + + * message.el (message-is-yours-p): Allow disabling canlock checking + (bug#9295). + (message-shoot-gnksa-feet): Add `canlock-verify'. + (message-auto-save-directory): Use ~/ as the auto-save directory if the + message directory isn't writable (bug#9304). + + * auth-source.el (auth-source-netrc-saver): Make the .authinfo file + non-world-readable. + 2011-08-17 Katsumi Yamaoka * nndraft.el (nndraft-update-unread-articles): Don't send delayed === modified file 'lisp/gnus/auth-source.el' --- lisp/gnus/auth-source.el 2011-07-03 22:24:12 +0000 +++ lisp/gnus/auth-source.el 2011-08-17 22:09:19 +0000 @@ -1377,6 +1377,8 @@ (insert "\n")) (insert add "\n") (write-region (point-min) (point-max) file nil 'silent) + ;; Make the .authinfo file non-world-readable. + (set-file-modes file #o600) (auth-source-do-debug "auth-source-netrc-create: wrote 1 new line to %s" file) === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-07-19 22:19:06 +0000 +++ lisp/gnus/message.el 2011-08-17 22:09:19 +0000 @@ -1310,7 +1310,7 @@ :type '(repeat function)) (defcustom message-auto-save-directory - (if (file-exists-p message-directory) + (if (file-writable-p message-directory) (file-name-as-directory (expand-file-name "drafts" message-directory)) "~/") "*Directory where Message auto-saves buffers if Gnus isn't running. @@ -1353,7 +1353,8 @@ `quoted-text-only' Allow you to post quoted text only; `multiple-copies' Allow you to post multiple copies; `cancel-messages' Allow you to cancel or supersede messages from - your other email addresses.") + your other email addresses; +`canlock-verify' Allow you to cancel messages without verifying canlock.") (defsubst message-gnksa-enable-p (feature) (or (not (listp message-shoot-gnksa-feet)) @@ -7037,7 +7038,8 @@ (save-excursion (save-restriction (message-narrow-to-head-1) - (if (message-fetch-field "Cancel-Lock") + (if (and (message-fetch-field "Cancel-Lock") + (message-gnksa-enable-p 'canlock-verify)) (if (null (canlock-verify)) t (error "Failed to verify Cancel-lock: This article is not yours")) ------------------------------------------------------------ revno: 105483 fixes bug(s): http://debbugs.gnu.org/9298 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Thu 2011-08-18 00:02:49 +0200 message: (auth-source): Require to avoid problems with binding variables. Also clean up some unused autoloads. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-08-17 20:50:33 +0000 +++ lisp/ChangeLog 2011-08-17 22:02:49 +0000 @@ -1,5 +1,9 @@ 2011-08-17 Lars Magne Ingebrigtsen + * mail/smtpmail.el (auth-source): Require to avoid problems with + binding variables (bug#9298). Also clean up some unused + autoloads. + * net/network-stream.el (network-stream-open-starttls): Support using starttls.el without using gnutls-cli. === modified file 'lisp/mail/smtpmail.el' --- lisp/mail/smtpmail.el 2011-08-04 00:58:07 +0000 +++ lisp/mail/smtpmail.el 2011-08-17 22:02:49 +0000 @@ -55,15 +55,12 @@ ;;; Code: (require 'sendmail) +(require 'auth-source) (autoload 'mail-strip-quoted-names "mail-utils") (autoload 'message-make-date "message") (autoload 'message-make-message-id "message") (autoload 'rfc2104-hash "rfc2104") -(autoload 'netrc-parse "netrc") -(autoload 'netrc-machine "netrc") -(autoload 'netrc-get "netrc") (autoload 'password-read "password-cache") -(autoload 'auth-source-search "auth-source") ;;; (defgroup smtpmail nil ------------------------------------------------------------ revno: 105482 fixes bug(s): http://debbugs.gnu.org/9081 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-08-17 17:40:13 -0400 message: Remove aborts from internal_condition_case*. * src/eval.c (internal_condition_case, internal_condition_case_1) (internal_condition_case_2, internal_condition_case_n): Remove unnecessary aborts. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-08-17 08:50:08 +0000 +++ src/ChangeLog 2011-08-17 21:40:13 +0000 @@ -1,3 +1,9 @@ +2011-08-17 Chong Yidong + + * eval.c (internal_condition_case, internal_condition_case_1) + (internal_condition_case_2, internal_condition_case_n): Remove + unnecessary aborts (Bug#9081). + 2011-08-17 Eli Zaretskii * lread.c (Fload) [DOS_NT]: If `openp' returns -2, but the file @@ -61,7 +67,7 @@ 2011-08-14 Kenichi Handa * process.c (create_process): Call setup_process_coding_systems - after the pid of the process is set to -1. + after the pid of the process is set to -1 (Bug#8162). 2011-08-14 Eli Zaretskii === modified file 'src/eval.c' --- src/eval.c 2011-07-07 02:14:52 +0000 +++ src/eval.c 2011-08-17 21:40:13 +0000 @@ -1461,13 +1461,6 @@ struct catchtag c; struct handler h; - /* Since Fsignal will close off all calls to x_catch_errors, - we will get the wrong results if some are not closed now. */ -#if HAVE_X_WINDOWS - if (x_catching_errors ()) - abort (); -#endif - c.tag = Qnil; c.val = Qnil; c.backlist = backtrace_list; @@ -1506,13 +1499,6 @@ struct catchtag c; struct handler h; - /* Since Fsignal will close off all calls to x_catch_errors, - we will get the wrong results if some are not closed now. */ -#if HAVE_X_WINDOWS - if (x_catching_errors ()) - abort (); -#endif - c.tag = Qnil; c.val = Qnil; c.backlist = backtrace_list; @@ -1555,13 +1541,6 @@ struct catchtag c; struct handler h; - /* Since Fsignal will close off all calls to x_catch_errors, - we will get the wrong results if some are not closed now. */ -#if HAVE_X_WINDOWS - if (x_catching_errors ()) - abort (); -#endif - c.tag = Qnil; c.val = Qnil; c.backlist = backtrace_list; @@ -1604,13 +1583,6 @@ struct catchtag c; struct handler h; - /* Since Fsignal will close off all calls to x_catch_errors, - we will get the wrong results if some are not closed now. */ -#if HAVE_X_WINDOWS - if (x_catching_errors ()) - abort (); -#endif - c.tag = Qnil; c.val = Qnil; c.backlist = backtrace_list; ------------------------------------------------------------ revno: 105481 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Wed 2011-08-17 22:50:33 +0200 message: (network-stream-open-starttls): Support using starttls.el without using gnutls-cli. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-08-17 17:11:49 +0000 +++ lisp/ChangeLog 2011-08-17 20:50:33 +0000 @@ -1,3 +1,8 @@ +2011-08-17 Lars Magne Ingebrigtsen + + * net/network-stream.el (network-stream-open-starttls): Support + using starttls.el without using gnutls-cli. + 2011-08-17 Juri Linkov * progmodes/grep.el (rgrep): Handle the case when === modified file 'lisp/net/network-stream.el' --- lisp/net/network-stream.el 2011-08-04 00:58:07 +0000 +++ lisp/net/network-stream.el 2011-08-17 20:50:33 +0000 @@ -237,13 +237,13 @@ (unless builtin-starttls (delete-process stream) (setq start (with-current-buffer buffer (point-max))) - (let* ((starttls-use-gnutls t) - (starttls-extra-arguments + (let* ((starttls-extra-arguments (if require-tls starttls-extra-arguments ;; For opportunistic TLS upgrades, we don't really ;; care about the identity of the peer. (cons "--insecure" starttls-extra-arguments))) + (starttls-extra-args starttls-extra-args) (cert (network-stream-certificate host service parameters))) ;; There are client certificates requested, so add them to ;; the command line. @@ -251,7 +251,11 @@ (setq starttls-extra-arguments (nconc (list "--x509keyfile" (expand-file-name (nth 0 cert)) "--x509certfile" (expand-file-name (nth 1 cert))) - starttls-extra-arguments))) + starttls-extra-arguments) + starttls-extra-args + (nconc (list "--key-file" (expand-file-name (nth 0 cert)) + "--cert-file" (expand-file-name (nth 1 cert))) + starttls-extra-args))) (setq stream (starttls-open-stream name buffer host service))) (network-stream-get-response stream start eoc) ;; Requery capabilities for protocols that require it; i.e., ------------------------------------------------------------ revno: 105480 fixes bug(s): http://debbugs.gnu.org/9278 committer: Juri Linkov branch nick: trunk timestamp: Wed 2011-08-17 20:11:49 +0300 message: * lisp/progmodes/grep.el (rgrep): Handle the case when `grep-find-command' is a cons cell. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-08-17 06:50:31 +0000 +++ lisp/ChangeLog 2011-08-17 17:11:49 +0000 @@ -1,3 +1,8 @@ +2011-08-17 Juri Linkov + + * progmodes/grep.el (rgrep): Handle the case when + `grep-find-command' is a cons cell (bug#9278). + 2011-08-17 Martin Rudalics * window.el (display-buffer-pop-up-frame): Run frame creation === modified file 'lisp/progmodes/grep.el' --- lisp/progmodes/grep.el 2011-08-10 18:29:31 +0000 +++ lisp/progmodes/grep.el 2011-08-17 17:11:49 +0000 @@ -965,7 +965,9 @@ (unless (and dir (file-directory-p dir) (file-readable-p dir)) (setq dir default-directory)) (if (null files) - (if (not (string= regexp grep-find-command)) + (if (not (string= regexp (if (consp grep-find-command) + (car grep-find-command) + grep-find-command))) (compilation-start regexp 'grep-mode)) (setq dir (file-name-as-directory (expand-file-name dir))) (require 'find-dired) ; for `find-name-arg' ------------------------------------------------------------ revno: 105479 fixes bug(s): http://debbugs.gnu.org/9311 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-08-17 11:50:08 +0300 message: Fix bug #9311 with loading on MS-Windows .elc files in root directories. src/lread.c (Fload) [DOS_NT]: If `openp' returns -2, but the file has no `load' handler, try opening the file locally. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-08-16 20:31:32 +0000 +++ src/ChangeLog 2011-08-17 08:50:08 +0000 @@ -1,3 +1,8 @@ +2011-08-17 Eli Zaretskii + + * lread.c (Fload) [DOS_NT]: If `openp' returns -2, but the file + has no `load' handler, try opening the file locally. (Bug#9311) + 2011-08-16 Ken Brown * gmalloc.c: Expand comment. === modified file 'src/lread.c' --- src/lread.c 2011-07-28 20:23:19 +0000 +++ src/lread.c 2011-08-17 08:50:08 +0000 @@ -1124,6 +1124,22 @@ handler = Ffind_file_name_handler (found, Qload); if (! NILP (handler)) return call5 (handler, Qload, found, noerror, nomessage, Qt); +#ifdef DOS_NT + /* Tramp has to deal with semi-broken packages that prepend + drive letters to remote files. For that reason, Tramp + catches file operations that test for file existence, which + makes openp think X:/foo.elc files are remote. However, + Tramp does not catch `load' operations for such files, so we + end up with a nil as the `load' handler above. If we would + continue with fd = -2, we will behave wrongly, and in + particular try reading a .elc file in the "rt" mode instead + of "rb". See bug #9311 for the results. To work around + this, we try to open the file locally, and go with that if it + succeeds. */ + fd = emacs_open (SSDATA (ENCODE_FILE (found)), O_RDONLY, 0); + if (fd == -1) + fd = -2; +#endif } /* Check if we're stuck in a recursive load cycle. @@ -1247,9 +1263,17 @@ GCPRO3 (file, found, hist_file_name); #ifdef WINDOWSNT - emacs_close (fd); efound = ENCODE_FILE (found); - stream = fopen (SSDATA (efound), fmode); + /* If we somehow got here with fd == -2, meaning the file is deemed + to be remote, don't even try to reopen the file locally; just + force a failure instead. */ + if (fd >= 0) + { + emacs_close (fd); + stream = fopen (SSDATA (efound), fmode); + } + else + stream = NULL; #else /* not WINDOWSNT */ stream = fdopen (fd, fmode); #endif /* not WINDOWSNT */