gitback/doomemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #387 from sarg/develop

Browse Source 
Check if buffer-file-name is nil before passing it as argument.
This commit is contained in:
Henrik Lissner 2018-01-30 22:49:46 -05:00 committed by GitHub
commit 9d82318d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/autoload/help.el
View File

@ -34,8 +34,9 @@ from a `featurep!' or `require!' call or c) the module that the current file is
in."
(interactive
(let ((module
(cond ((string= (file-truename user-init-file)
(file-truename buffer-file-name))
(cond ((and buffer-file-name
(string= (file-truename user-init-file)
(file-truename buffer-file-name)))
(let* ((category
(save-excursion
(goto-char (line-end-position))
@ -67,7 +68,8 @@ in."
(let ((sexp (sexp-at-point)))
(when (memq (car-safe sexp) '(featurep! require!))
(format "%s %s" (nth 1 sexp) (nth 2 sexp))))))
((file-in-directory-p buffer-file-name doom-modules-dir)
((and buffer-file-name
(file-in-directory-p buffer-file-name doom-modules-dir))
(let ((module (doom-module-from-path buffer-file-name)))
(format "%s %s" (car module) (cdr module)))))))
(list (completing-read "Describe module: "