procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Put cpp config file to ~/.emacs.d/cpp.el if possible (Bug#28685)

Browse source 
If `cpp-config-file` starts with '.', remove the '.'
when putting the file to ~/.emacs.d.
Suggested by Noam Postavsky <npostavs@users.sourceforge.net>

* lisp/progmodes/cpp.el (cpp-locate-user-emacs-file): New
function wrapping `locate-user-emacs-file`.
(cpp-edit-load, cpp-edit-save): Use it.
This commit is contained in:
Masatake YAMATO 2017-10-22 18:22:41 +09:00 • committed by Noam Postavsky
parent aa44308429
commit 9c8f8de0f3
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lisp/progmodes/cpp.el
View file

@ -568,6 +568,14 @@ You can also use the keyboard accelerators indicated like this: [K]ey."
(set-window-start nil start) (set-window-start nil start)
(goto-char pos))) (goto-char pos)))
(defun cpp-locate-user-emacs-file (file)
(locate-user-emacs-file
;; Remove initial '.' from file.
(if (eq (aref file 0) ?.)
(substring file 1)
file)
file))
(defun cpp-edit-load () (defun cpp-edit-load ()
"Load cpp configuration." "Load cpp configuration."
(interactive) (interactive)
@ -576,8 +584,8 @@ You can also use the keyboard accelerators indicated like this: [K]ey."
nil) nil)
((file-readable-p cpp-config-file) ((file-readable-p cpp-config-file)
(load-file cpp-config-file)) (load-file cpp-config-file))
((file-readable-p (concat "~/" cpp-config-file)) ((file-readable-p (cpp-locate-user-emacs-file cpp-config-file))
(load-file (concat "~/" cpp-config-file)))) (load-file (cpp-locate-user-emacs-file cpp-config-file))))
(if (derived-mode-p 'cpp-edit-mode) (if (derived-mode-p 'cpp-edit-mode)
(cpp-edit-reset))) (cpp-edit-reset)))
@ -588,7 +596,7 @@ You can also use the keyboard accelerators indicated like this: [K]ey."
(with-current-buffer cpp-edit-buffer (with-current-buffer cpp-edit-buffer
(let* ((config-file (if (file-writable-p cpp-config-file) (let* ((config-file (if (file-writable-p cpp-config-file)
cpp-config-file cpp-config-file
(concat "~/" cpp-config-file))) (cpp-locate-user-emacs-file cpp-config-file)))
(buffer (find-file-noselect config-file))) (buffer (find-file-noselect config-file)))
(set-buffer buffer) (set-buffer buffer)
(erase-buffer) (erase-buffer)