diff options
| author | Kenichi Handa | 2011-11-11 16:08:47 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2011-11-11 16:08:47 +0900 |
| commit | 0756b0c3a6e60dd623da6f12bc8d2de05ef7b8f1 (patch) | |
| tree | 0846cacac3ba56cb8d2054fbc851fee2fb9606d2 /etc | |
| parent | 9ac0394b8d1e54bf1b49291c85770af36a94531e (diff) | |
| parent | 68cbc58be59373e805fa200db02e4022e20050f0 (diff) | |
| download | emacs-0756b0c3a6e60dd623da6f12bc8d2de05ef7b8f1.tar.gz emacs-0756b0c3a6e60dd623da6f12bc8d2de05ef7b8f1.zip | |
merge trunk
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | etc/images/icons/allout-widgets/light-bg/locked-encrypted.png | bin | 210 -> 210 bytes | |||
| -rw-r--r--[-rwxr-xr-x] | etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png | bin | 202 -> 202 bytes |
3 files changed, 4 insertions, 0 deletions
| @@ -621,6 +621,10 @@ view-diary-entries, list-diary-entries, show-all-diary-entries | |||
| 621 | inserted by the compilation filter function, when calling | 621 | inserted by the compilation filter function, when calling |
| 622 | compilation-filter-hook. | 622 | compilation-filter-hook. |
| 623 | 623 | ||
| 624 | *** `compilation-error-screen-columns' is obeyed in the editing buffer. | ||
| 625 | So programming language modes can set it, whereas previously only the value | ||
| 626 | in the *compilation* buffer was used. | ||
| 627 | |||
| 624 | ** Customize | 628 | ** Customize |
| 625 | 629 | ||
| 626 | *** Customize buffers now contain a search field. | 630 | *** Customize buffers now contain a search field. |
diff --git a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png index a6bc3e99a7a..a6bc3e99a7a 100755..100644 --- a/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png +++ b/etc/images/icons/allout-widgets/light-bg/locked-encrypted.png | |||
| Binary files differ | |||
diff --git a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png index e70d075690a..e70d075690a 100755..100644 --- a/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png +++ b/etc/images/icons/allout-widgets/light-bg/unlocked-encrypted.png | |||
| Binary files differ | |||
