Replace org-mode-p with usual (eq major-mode 'org-mode) check

Additionally, replace one

  (or (org-mode-p) (derived-mode-p 'org-mode))

with

  (derived-mode-p 'org-mode)

cause that is reflexive anyway (returns true, if the current mode is
org-mode).

Delete one check testing for org-mode or org derived mode
This commit is contained in:
Tassilo Horn 2011-10-11 09:07:27 +02:00 committed by Bastien Guerry
parent 531d67a715
commit d0caf96afd

View file

@ -157,7 +157,7 @@ If both match values are nil, return all contacts."
(dolist (file (org-contacts-files)) (dolist (file (org-contacts-files))
(org-check-agenda-file file) (org-check-agenda-file file)
(with-current-buffer (org-get-agenda-file-buffer file) (with-current-buffer (org-get-agenda-file-buffer file)
(unless (org-mode-p) (unless (eq major-mode 'org-mode)
(error "File %s is no in `org-mode'" file)) (error "File %s is no in `org-mode'" file))
(org-scan-tags (org-scan-tags
'(add-to-list 'markers (set-marker (make-marker) (point))) '(add-to-list 'markers (set-marker (make-marker) (point)))
@ -262,7 +262,7 @@ If both match values are nil, return all contacts."
(when marker (when marker
(switch-to-buffer-other-window (marker-buffer marker)) (switch-to-buffer-other-window (marker-buffer marker))
(goto-char marker) (goto-char marker)
(when (org-mode-p) (when (eq major-mode 'org-mode)
(org-show-context 'agenda) (org-show-context 'agenda)
(save-excursion (save-excursion
(and (outline-next-heading) (and (outline-next-heading)