diff options
| author | Joakim Verona | 2013-08-27 19:32:10 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-27 19:32:10 +0200 |
| commit | ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4 (patch) | |
| tree | f2e7b583160ca1f9735006d6304e5d7f479498e3 /admin/admin.el | |
| parent | 9d6363e6a7ca3d8c89d8e1e92500793a56e749e6 (diff) | |
| parent | 278208b8e6917af1e7e2623a3869614fa70059ed (diff) | |
| download | emacs-ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4.tar.gz emacs-ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4.zip | |
merge from trunk
Diffstat (limited to 'admin/admin.el')
| -rw-r--r-- | admin/admin.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/admin/admin.el b/admin/admin.el index 875db2948e5..f8ca8aec261 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -289,9 +289,8 @@ Optional argument TYPE is type of output (nil means all)." | |||
| 289 | 289 | ||
| 290 | (defun manual-misc-html (name root html-node-dir html-mono-dir) | 290 | (defun manual-misc-html (name root html-node-dir html-mono-dir) |
| 291 | ;; Hack to deal with the cases where .texi creates a different .info. | 291 | ;; Hack to deal with the cases where .texi creates a different .info. |
| 292 | ;; Blech. TODO Why not just rename the .texi files? | 292 | ;; Blech. TODO Why not just rename the .texi (or .info) files? |
| 293 | (let* ((texiname (cond ((equal name "ccmode") "cc-mode") | 293 | (let* ((texiname (cond ((equal name "ccmode") "cc-mode") |
| 294 | ((equal name "efaq") "faq") | ||
| 295 | (t name))) | 294 | (t name))) |
| 296 | (texi (expand-file-name (format "doc/misc/%s.texi" texiname) root))) | 295 | (texi (expand-file-name (format "doc/misc/%s.texi" texiname) root))) |
| 297 | (manual-html-node texi (expand-file-name name html-node-dir)) | 296 | (manual-html-node texi (expand-file-name name html-node-dir)) |