From 5c53026d320b7716f9a28a0430fa021ad5b8d649 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 18 Jul 2011 19:25:10 +0200 Subject: [PATCH] Fix (a lot of) compiler warnings. Also introduce `org-pop-to-buffer-same-window' as a compatibility function for Emacs =>24.1. --- contrib/lisp/org-drill.el | 6 ++--- contrib/lisp/org-eshell.el | 2 +- contrib/lisp/org-mac-iCal.el | 2 +- contrib/lisp/org-screen.el | 4 ++-- contrib/lisp/org-toc.el | 10 ++++----- contrib/lisp/org-velocity.el | 4 ++-- contrib/lisp/org-wikinodes.el | 2 +- contrib/lisp/org-xhtml.el | 2 +- contrib/lisp/test-org-export-preproc.el | 2 +- lisp/ob-ref.el | 4 +++- lisp/org-agenda.el | 9 +++++--- lisp/org-capture.el | 7 ++++-- lisp/org-clock.el | 3 ++- lisp/org-compat.el | 9 ++++++++ lisp/org-ctags.el | 4 +++- lisp/org-exp.el | 17 ++++++++------ lisp/org-feed.el | 2 +- lisp/org-footnote.el | 2 ++ lisp/org-html.el | 4 +++- lisp/org-id.el | 4 +++- lisp/org-irc.el | 8 ++++--- lisp/org-latex.el | 4 ++-- lisp/org-list.el | 2 +- lisp/org-macs.el | 1 + lisp/org-mobile.el | 5 ++++- lisp/org-publish.el | 6 +++-- lisp/org-remember.el | 6 ++++- lisp/org-src.el | 12 +++++----- lisp/org.el | 30 ++++++++++++++----------- 29 files changed, 110 insertions(+), 63 deletions(-) diff --git a/contrib/lisp/org-drill.el b/contrib/lisp/org-drill.el index 9f84fac48..5e8957063 100644 --- a/contrib/lisp/org-drill.el +++ b/contrib/lisp/org-drill.el @@ -621,7 +621,7 @@ situation use `org-part-of-drill-entry-p'." (defun org-drill-goto-entry (marker) - (switch-to-buffer (marker-buffer marker)) + (org-pop-to-buffer-same-window (marker-buffer marker)) (goto-char marker)) @@ -2602,7 +2602,7 @@ the tag 'imported'." (unless path (setq path (org-get-outline-path))) (org-copy-subtree) - (switch-to-buffer dest) + (org-pop-to-buffer-same-window dest) (setq m (condition-case nil (org-find-olp path t) @@ -2684,7 +2684,7 @@ copy them across." scheduled-time (org-get-scheduled-time (point))) (save-excursion ;; go to matching entry in destination buffer - (switch-to-buffer (marker-buffer marker)) + (org-pop-to-buffer-same-window (marker-buffer marker)) (goto-char marker) (org-drill-strip-entry-data) (unless (zerop total-repeats) diff --git a/contrib/lisp/org-eshell.el b/contrib/lisp/org-eshell.el index 85b2ab97d..c489bb878 100644 --- a/contrib/lisp/org-eshell.el +++ b/contrib/lisp/org-eshell.el @@ -42,7 +42,7 @@ (eshell-buffer-name (car buffer-and-command)) (command (cadr buffer-and-command))) (if (get-buffer eshell-buffer-name) - (switch-to-buffer eshell-buffer-name) + (org-pop-to-buffer-same-window eshell-buffer-name) (eshell)) (end-of-buffer) (eshell-kill-input) diff --git a/contrib/lisp/org-mac-iCal.el b/contrib/lisp/org-mac-iCal.el index 2510aa7f1..7a1e1f0b4 100644 --- a/contrib/lisp/org-mac-iCal.el +++ b/contrib/lisp/org-mac-iCal.el @@ -126,7 +126,7 @@ the the Emacs diary" (setq usedCalendarsFiles (directory-files "~/Library/Calendars" 1 ".*ics$")) (omi-delete-ics-file usedCalendarsFiles) - (switch-to-buffer currentBuffer)) + (org-pop-to-buffer-same-window currentBuffer)) (defun omi-concat-leopard-ics (list) "Leopard stores each iCal.app event in a separate ics file. diff --git a/contrib/lisp/org-screen.el b/contrib/lisp/org-screen.el index fb1e73fbd..5af686833 100644 --- a/contrib/lisp/org-screen.el +++ b/contrib/lisp/org-screen.el @@ -96,8 +96,8 @@ is copied from ansi-term method." (let ((screen-buffer-name (org-screen-buffer-name name))) (if (member screen-buffer-name (mapcar 'buffer-name (buffer-list))) - (switch-to-buffer screen-buffer-name) - (switch-to-buffer (org-screen-helper name "-dr"))))) + (org-pop-to-buffer-same-window screen-buffer-name) + (org-pop-to-buffer-same-window (org-screen-helper name "-dr"))))) (if org-link-abbrev-alist (add-to-list 'org-link-abbrev-alist diff --git a/contrib/lisp/org-toc.el b/contrib/lisp/org-toc.el index 67e408e62..992dc855a 100644 --- a/contrib/lisp/org-toc.el +++ b/contrib/lisp/org-toc.el @@ -220,7 +220,7 @@ specified, then make `org-toc-recenter' use this value." (progn (setq org-toc-base-buffer (current-buffer)) (setq org-toc-odd-levels-only org-odd-levels-only)) (if (eq major-mode 'org-toc-mode) - (switch-to-buffer org-toc-base-buffer) + (org-pop-to-buffer-same-window org-toc-base-buffer) (error "Not in an Org buffer"))) ;; create the new window display (let ((pos (or position @@ -342,13 +342,13 @@ If DELETE is non-nil, delete other windows when in the Org buffer." "Toggle columns view in the Org buffer from Org TOC." (interactive) (let ((indirect-buffer (current-buffer))) - (switch-to-buffer org-toc-base-buffer) + (org-pop-to-buffer-same-window org-toc-base-buffer) (if (not org-toc-columns-shown) (progn (org-columns) (setq org-toc-columns-shown t)) (progn (org-columns-remove-overlays) (setq org-toc-columns-shown nil))) - (switch-to-buffer indirect-buffer))) + (org-pop-to-buffer-same-window indirect-buffer))) (defun org-toc-info () "Show properties of current subtree in the echo-area." @@ -356,7 +356,7 @@ If DELETE is non-nil, delete other windows when in the Org buffer." (let ((pos (point)) (indirect-buffer (current-buffer)) props prop msg) - (switch-to-buffer org-toc-base-buffer) + (org-pop-to-buffer-same-window org-toc-base-buffer) (goto-char pos) (setq props (org-entry-properties)) (while (setq prop (pop props)) @@ -369,7 +369,7 @@ If DELETE is non-nil, delete other windows when in the Org buffer." (setq p (concat p ":")) (add-text-properties 0 (length p) '(face org-special-keyword) p) (setq msg (concat msg p " " v " "))))) - (switch-to-buffer indirect-buffer) + (org-pop-to-buffer-same-window indirect-buffer) (message msg))) ;;; Store and restore TOC configuration: diff --git a/contrib/lisp/org-velocity.el b/contrib/lisp/org-velocity.el index 4bba50448..524f98914 100644 --- a/contrib/lisp/org-velocity.el +++ b/contrib/lisp/org-velocity.el @@ -279,7 +279,7 @@ If there is no last heading, return nil." (org-velocity-edit-entry ',heading) (progn (message "%s" ,(org-velocity-heading-name heading)) - (switch-to-buffer (marker-buffer + (org-pop-to-buffer-same-window (marker-buffer ,(org-velocity-heading-marker heading))) (goto-char (marker-position ,(org-velocity-heading-marker heading))))))) @@ -681,7 +681,7 @@ Use method specified by `org-velocity-search-method'." (read-string prompt)))) (remove-hook 'post-command-hook 'org-velocity-display-for-incremental)))) - (if (bufferp res) (switch-to-buffer res) res))) + (if (bufferp res) (org-pop-to-buffer-same-window res) res))) (defun org-velocity-read (arg &optional search) "Read a search string SEARCH for Org-Velocity interface. diff --git a/contrib/lisp/org-wikinodes.el b/contrib/lisp/org-wikinodes.el index 85c32f6ce..02ca09ac3 100644 --- a/contrib/lisp/org-wikinodes.el +++ b/contrib/lisp/org-wikinodes.el @@ -155,7 +155,7 @@ setting of `org-wikinodes-create-targets'." ((stringp create) ;; Make new node in another file (org-mark-ring-push (point)) - (switch-to-buffer (find-file-noselect create)) + (org-pop-to-buffer-same-window (find-file-noselect create)) (goto-char (point-max)) (or (bolp) (newline)) (insert "\n* " target "\n") diff --git a/contrib/lisp/org-xhtml.el b/contrib/lisp/org-xhtml.el index f4b47c952..f3d8079bb 100644 --- a/contrib/lisp/org-xhtml.el +++ b/contrib/lisp/org-xhtml.el @@ -943,7 +943,7 @@ that uses these same face definitions." (when (and (symbolp f) (or (not i) (not (listp i)))) (insert (org-add-props (copy-sequence "1") nil 'face f)))) (htmlize-region (point-min) (point-max)))) - (switch-to-buffer "*html*") + (org-pop-to-buffer-same-window "*html*") (goto-char (point-min)) (if (re-search-forward " m (point-max))) (widen)) (goto-char m) (org-show-entry) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index cb61e1a71..c67660569 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -433,6 +433,15 @@ With two arguments, return floor and remainder of their quotient." (let ((q (floor x y))) (list q (- x (if y (* y q) q))))) +;; `pop-to-buffer-same-window' has been introduced with Emacs 24.1. +(defun org-pop-to-buffer-same-window + (&optional buffer-or-name norecord label) + "Pop to buffer specified by BUFFER-OR-NAME in the selected window." + (if (fboundp 'pop-to-buffer-same-window) + (funcall + 'pop-to-buffer-same-window buffer-or-name norecord label) + (funcall 'switch-to-buffer buffer-or-name norecord))) + (provide 'org-compat) ;; arch-tag: a0a0579f-e68c-4bdf-9e55-93768b846bbe diff --git a/lisp/org-ctags.el b/lisp/org-ctags.el index 15db50b6a..802fa5835 100644 --- a/lisp/org-ctags.el +++ b/lisp/org-ctags.el @@ -140,6 +140,8 @@ (require 'org) +(declare-function org-pop-to-buffer-same-window "org-compat" (&optional buffer-or-name norecord label)) + (defgroup org-ctags nil "Options concerning use of ctags within org mode." :tag "Org-Ctags" @@ -385,7 +387,7 @@ the new file." (cond ((get-buffer (concat name ".org")) ;; Buffer is already open - (switch-to-buffer (get-buffer (concat name ".org")))) + (org-pop-to-buffer-same-window (get-buffer (concat name ".org")))) ((file-exists-p filename) ;; File exists but is not open --> open it (message "Opening existing org file `%S'..." diff --git a/lisp/org-exp.el b/lisp/org-exp.el index b60e3d448..8628d1fd7 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -48,6 +48,9 @@ (declare-function org-inlinetask-remove-END-maybe "org-inlinetask" ()) (declare-function org-table-cookie-line-p "org-table" (line)) (declare-function org-table-colgroup-line-p "org-table" (line)) +(declare-function org-pop-to-buffer-same-window "org-compat" + (&optional buffer-or-name norecord label)) + (autoload 'org-export-generic "org-export-generic" "Export using the generic exporter" t) (autoload 'org-export-as-odt "org-odt" @@ -1633,9 +1636,9 @@ from the buffer." (defun org-export-protect-quoted-subtrees () "Mark quoted subtrees with the protection property." - (let ((re-quote (concat "^\\*+[ \t]+" org-quote-string "\\>"))) + (let ((org-re-quote (concat "^\\*+[ \t]+" org-quote-string "\\>"))) (goto-char (point-min)) - (while (re-search-forward re-quote nil t) + (while (re-search-forward org-re-quote nil t) (goto-char (match-beginning 0)) (end-of-line 1) (add-text-properties (point) (org-end-of-subtree t) @@ -1934,9 +1937,9 @@ table line. If it is a link, add it to the line containing the link." (goto-char (match-beginning 0)) (delete-region (point) (org-end-of-subtree t))))) -(defun org-export-handle-comments (commentsp) +(defun org-export-handle-comments (org-commentsp) "Remove comments, or convert to backend-specific format. -COMMENTSP can be a format string for publishing comments. +ORG-COMMENTSP can be a format string for publishing comments. When it is nil, all comments will be removed." (let ((re "^\\(#\\|[ \t]*#\\+ \\)\\(.*\n?\\)") pos) @@ -1946,12 +1949,12 @@ When it is nil, all comments will be removed." (setq pos (match-beginning 0)) (if (get-text-property pos 'org-protected) (goto-char (1+ pos)) - (if (and commentsp + (if (and org-commentsp (not (equal (char-before (match-end 1)) ?+))) (progn (add-text-properties (match-beginning 0) (match-end 0) '(org-protected t)) (replace-match (org-add-props - (format commentsp (match-string 2)) + (format org-commentsp (match-string 2)) nil 'org-protected t) t t)) (goto-char (1+ pos)) @@ -2967,7 +2970,7 @@ directory." (region (buffer-string)) str-ret) (save-excursion - (switch-to-buffer buffer) + (org-pop-to-buffer-same-window buffer) (erase-buffer) (insert region) (let ((org-inhibit-startup t)) (org-mode)) diff --git a/lisp/org-feed.el b/lisp/org-feed.el index 581dbc14a..1f47ad663 100644 --- a/lisp/org-feed.el +++ b/lisp/org-feed.el @@ -436,7 +436,7 @@ it can be a list structured like an entry in `org-feed-alist'." (if (stringp feed) (setq feed (assoc feed org-feed-alist))) (unless feed (error "No such feed in `org-feed-alist")) - (switch-to-buffer + (org-pop-to-buffer-same-window (org-feed-update feed 'retrieve-only)) (goto-char (point-min))) diff --git a/lisp/org-footnote.el b/lisp/org-footnote.el index aa84e2554..305c5f237 100644 --- a/lisp/org-footnote.el +++ b/lisp/org-footnote.el @@ -55,6 +55,8 @@ (declare-function org-fill-paragraph "org" (&optional justify)) (declare-function org-export-preprocess-string "org-exp" (string &rest parameters)) + +(defvar org-outline-regexp-bol) ; defined in org.el (defvar org-odd-levels-only) ;; defined in org.el (defvar org-bracket-link-regexp) ; defined in org.el (defvar message-signature-separator) ;; defined in message.el diff --git a/lisp/org-html.el b/lisp/org-html.el index 17f6b4f41..82d369db2 100644 --- a/lisp/org-html.el +++ b/lisp/org-html.el @@ -35,6 +35,8 @@ (declare-function org-id-find-id-file "org-id" (id)) (declare-function htmlize-region "ext:htmlize" (beg end)) +(declare-function org-pop-to-buffer-same-window + "org-compat" (&optional buffer-or-name norecord label)) (defgroup org-export-html nil "Options specific for HTML export of Org-mode files." @@ -2244,7 +2246,7 @@ that uses these same face definitions." (when (and (symbolp f) (or (not i) (not (listp i)))) (insert (org-add-props (copy-sequence "1") nil 'face f)))) (htmlize-region (point-min) (point-max)))) - (switch-to-buffer "*html*") + (org-pop-to-buffer-same-window "*html*") (goto-char (point-min)) (if (re-search-forward " marker (point-max)) (< marker (point-min))) (widen)) (goto-char marker)