Mercurial > emacs
changeset 109831:aa32976d0c44
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 18 Aug 2010 06:23:18 +0000 |
| parents | 46f382b913d6 (current diff) a39d52cde554 (diff) |
| children | 98f2d1d177a5 |
| files | |
| diffstat | 6 files changed, 20 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS Tue Aug 17 22:47:11 2010 +0000 +++ b/etc/NEWS Wed Aug 18 06:23:18 2010 +0000 @@ -214,6 +214,8 @@ * Changes in Specialized Modes and Packages in Emacs 24.1 +** FIXME: xdg-open for browse-url and reportbug, 2010/08. + ** Archive Mode has basic support to browse 7z archives. ** ERC changes
--- a/lisp/gnus/gnus-sum.el Tue Aug 17 22:47:11 2010 +0000 +++ b/lisp/gnus/gnus-sum.el Wed Aug 18 06:23:18 2010 +0000 @@ -12627,7 +12627,7 @@ (declare-function bookmark-default-handler "bookmark" (bmk)) (declare-function bookmark-get-bookmark-record "bookmark" (bmk)) (defvar bookmark-yank-point) -(defvar bookmark-current-bookmark) +(defvar bookmark-current-buffer) (defun gnus-summary-bookmark-make-record () "Make a bookmark entry for a Gnus summary buffer."
--- a/lisp/org/ChangeLog Tue Aug 17 22:47:11 2010 +0000 +++ b/lisp/org/ChangeLog Wed Aug 18 06:23:18 2010 +0000 @@ -1,3 +1,13 @@ +2010-08-18 Glenn Morris <rgm@gnu.org> + + * ob.el: Require org when compiling. + (org-save-outline-visibility): Remove macro declaration. + * ob-emacs-lisp.el: Require ob-comint when compiling, for macros. + Remove unnecessary/macro declarations. + * org-docview.el: Require doc-view when compiling. + (doc-view-goto-page): Autoload rather than declaring. + (doc-view-current-page): Remove macro declaration. + 2010-08-17 Glenn Morris <rgm@gnu.org> * ob.el (tramp-compat-make-temp-file, org-edit-src-code)
--- a/lisp/org/ob-emacs-lisp.el Tue Aug 17 22:47:11 2010 +0000 +++ b/lisp/org/ob-emacs-lisp.el Wed Aug 18 06:23:18 2010 +0000 @@ -28,15 +28,12 @@ ;;; Code: (require 'ob) +(eval-when-compile (require 'ob-comint)) (defvar org-babel-default-header-args:emacs-lisp '((:hlines . "yes") (:colnames . "no")) "Default arguments for evaluating an emacs-lisp source block.") -(declare-function org-babel-comint-with-output "ob-comint" (&rest body)) -(declare-function org-babel-comint-buffer-livep "ob-comint" (buffer)) -(declare-function org-babel-comint-wait-for-output "ob-comint" (buffer)) -(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body)) (declare-function orgtbl-to-generic "org-table" (table params)) (defun org-babel-expand-body:emacs-lisp (body params &optional processed-params)
--- a/lisp/org/ob.el Tue Aug 17 22:47:11 2010 +0000 +++ b/lisp/org/ob.el Wed Aug 18 06:23:18 2010 +0000 @@ -29,7 +29,9 @@ ;; http://orgmode.org/worg/org-contrib/babel/ ;;; Code: -(eval-when-compile (require 'cl)) +(eval-when-compile + (require 'cl) + (require 'org)) ; org-save-outline-visibility macro (require 'org-macs) (defvar org-babel-call-process-region-original) @@ -40,10 +42,9 @@ (declare-function tramp-file-name-user "tramp" (vec)) (declare-function tramp-file-name-host "tramp" (vec)) (declare-function org-icompleting-read "org" (&rest args)) -(declare-function org-edit-src-code "org-src" +(declare-function org-edit-src-code "org-src" (&optional context code edit-buffer-name)) (declare-function org-open-at-point "org" (&optional in-emacs reference-buffer)) -(declare-function org-save-outline-visibility "org" (use-markers &rest body)) (declare-function org-narrow-to-subtree "org" ()) (declare-function org-entry-get "org" (pom property &optional inherit literal-nil)) (declare-function org-make-options-regexp "org" (kwds &optional extra))
--- a/lisp/org/org-docview.el Tue Aug 17 22:47:11 2010 +0000 +++ b/lisp/org/org-docview.el Wed Aug 18 06:23:18 2010 +0000 @@ -45,9 +45,9 @@ (require 'org) +(eval-when-compile (require 'doc-view)) ; doc-view-current-page macro -(declare-function doc-view-goto-page "doc-view" (page)) -(declare-function doc-view-current-page "doc-view" (&optional win)) +(autoload 'doc-view-goto-page "doc-view") (org-add-link-type "docview" 'org-docview-open) (add-hook 'org-store-link-functions 'org-docview-store-link)