[O] Using org-goto loses org-todo-keyword-faces settings

[Dale]

Hi,

        My thanks to everyone who works on org-mode.  It is a truly 
indispensable tool.

        I'm not sure if I have a bug or a feature request: I have custom faces 
set up for my todo keywords (see my file local variable for 
org-todo-keyword-faces at the bottom of this report).   When I use org-goto 
(C-c C-j) and then exit goto mode, my custom colors for todo keywords are reset 
to the defaults.

        Explicitly:

1. Create and save an org file with the following contents:

------8<------Cut here------8<------
* WAITING test1

#+TODO: NEW(n) PENDING(p!) WAITING(w!) HOLD(h!) | DONE(d!) CANCELLED(c!)

# Local Variables:
# org-todo-keyword-faces: (("WAITING" . "dark orange")
#                          ("HOLD" . "dark orange"))
# End:
------8<------Cut here------8<------

2. Revert the buffer to pick up the in-buffer configuration including file 
local variables.

3. C-c C-j followed by C-g to exit goto mode.

What I expected: WAITING would still be "dark orange" when I exit goto mode.

What I observed: WAITING reverts to the default red color when I exit goto mode.

(WAITING is also red while I'm in org-goto mode, which is less of a problem for 
me.  I'd be happy enough if the color was just restored when I'm done with 
org-goto.)

        I would, of course, be grateful if my org-todo-keyword-faces would 
still be respected after using goto mode.

        I am using Emacs 24.3.1, apparently, the unofficial Emacs Mac Port 
(ftp://ftp.math.s.chiba-u.ac.jp/emacs/).  I just confirmed this behavior using 
org-mode's master branch from git://orgmode.org/org-mode.git as of a few 
minutes ago.  The output from org-submit-bug-report is below.

Thanks for everything,
Dale


Emacs  : GNU Emacs 24.3.1 (x86_64-apple-darwin12.4.0, Carbon Version 1.6.0 
AppKit 1187.39)
 of 2013-06-26
Package: Org-mode version 8.0.7 (release_8.0.7-383-g927f1b @ 
/Users/dale/.emacs.d/packages/org-mode/)

current state:
==============
(setq
 org-hide-leading-stars t
 org-tab-first-hook '(org-hide-block-toggle-maybe
                      org-src-native-tab-command-maybe
                      org-babel-hide-result-toggle-maybe
                      org-babel-header-arg-expand)
 org-speed-command-hook '(org-speed-command-default-hook
                          org-babel-speed-command-hook)
 org-reverse-note-order t
 org-time-clocksum-format "%d:%02d"
 org-occur-hook '(org-first-headline-recenter)
 org-metaup-hook '(org-babel-load-in-session-maybe)
 org-agenda-todo-ignore-deadlines 'far
 org-src-window-setup 'other-window
 org-confirm-shell-link-function 'yes-or-no-p
 org-agenda-todo-ignore-scheduled 1
 org-default-notes-file "~/todo.org"
 org-startup-indented t
 org-after-todo-state-change-hook '(org-clock-out-if-current)
 org-src-mode-hook '(org-src-babel-configure-edit-buffer
                     org-src-mode-configure-edit-buffer)
 org-tags-column -76
 org-agenda-before-write-hook '(org-agenda-add-entry-text)
 org-babel-pre-tangle-hook '(save-buffer)
 org-agenda-dim-blocked-tasks nil
 org-mode-hook '(#[nil "\300\301\302\303\304$\207"
                   [org-add-hook change-major-mode-hook org-show-block-all
                    append local]
                   5]
                 #[nil "\300\301\302\303\304$\207"
                   [org-add-hook change-major-mode-hook
                    org-babel-show-result-all append local]
                   5]
                 org-babel-result-hide-spec org-babel-hide-all-hashes
                 my:org-mode-hook)
 org-outline-path-complete-in-steps nil
 org-agenda-todo-list-sublevels nil
 org-replace-disputed-keys t
 org-ctrl-c-ctrl-c-hook '(org-babel-hash-at-point
                          org-babel-execute-safely-maybe)
 org-refile-use-outline-path t
 org-enforce-todo-dependencies t
 org-cycle-hook '(org-cycle-hide-archived-subtrees org-cycle-hide-drawers
                  org-cycle-hide-inline-tasks org-cycle-show-empty-lines
                  org-optimize-window-after-visibility-change)
 org-after-refile-insert-hook '(my:org-maybe-note-refile)
 org-metareturn-hook '(my:org-meta-return-hook)
 org-confirm-elisp-link-function 'yes-or-no-p
 org-metadown-hook '(org-babel-pop-to-session-maybe)
 org-default-priority 68
 org-blocker-hook '(org-block-todo-from-children-or-siblings-or-parent)
 org-completion-use-ido t
 org-src-preserve-indentation t
 org-clock-in-hook '(my:org-clock-in-set-pending-hook)
 org-agenda-files '("~/todo.org")
 org-clock-out-hook '(org-clock-remove-empty-clock-drawer)
 )

In-buffer configuration:

#+TODO: NEW(n) PENDING(p!) WAITING(w!) HOLD(h!) | DONE(d!) CANCELLED(c!)

# Local Variables:
# org-todo-keyword-faces: (("WAITING" . "dark orange")
#                          ("HOLD" . "dark orange"))
# End: