diff options
| author | Joakim Verona | 2013-07-14 11:04:49 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-14 11:04:49 +0200 |
| commit | 0bb9bb0841d89fff09820a57369df4cb01b16b43 (patch) | |
| tree | 832bf9fa8415eef0ce464d22b3ee1300cfa90bb1 /lisp/autoinsert.el | |
| parent | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (diff) | |
| parent | 3af1c8684ed6e48fbc21481d129e9aa164752c6e (diff) | |
| download | emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.tar.gz emacs-0bb9bb0841d89fff09820a57369df4cb01b16b43.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/xdisp.c
Diffstat (limited to 'lisp/autoinsert.el')
| -rw-r--r-- | lisp/autoinsert.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el index c45d64e1cd9..daa654889b6 100644 --- a/lisp/autoinsert.el +++ b/lisp/autoinsert.el | |||
| @@ -164,7 +164,10 @@ If this contains a %s, that will be replaced by the matching rule." | |||
| 164 | 164 | ||
| 165 | (("\\.el\\'" . "Emacs Lisp header") | 165 | (("\\.el\\'" . "Emacs Lisp header") |
| 166 | "Short description: " | 166 | "Short description: " |
| 167 | ";;; " (file-name-nondirectory (buffer-file-name)) " --- " str " | 167 | ";;; " (file-name-nondirectory (buffer-file-name)) " --- " str |
| 168 | (make-string (max 2 (- 80 (current-column) 27)) ?\s) | ||
| 169 | "-*- lexical-binding: t; -*-" | ||
| 170 | " | ||
| 168 | 171 | ||
| 169 | ;; Copyright (C) " (format-time-string "%Y") " " | 172 | ;; Copyright (C) " (format-time-string "%Y") " " |
| 170 | (getenv "ORGANIZATION") | (progn user-full-name) " | 173 | (getenv "ORGANIZATION") | (progn user-full-name) " |