diff options
| author | Lars Magne Ingebrigtsen | 2011-07-13 15:25:29 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-13 15:25:29 +0200 |
| commit | 9c9c2d8874e433ba37a9b81934a44acc95f7cc0f (patch) | |
| tree | 8783f69818fb2250fbc5196b7ff3da2910595a9d /lisp | |
| parent | 1c4dd947d6d684b2d3c3dc298f2ee09e8fc0308b (diff) | |
| download | emacs-9c9c2d8874e433ba37a9b81934a44acc95f7cc0f.tar.gz emacs-9c9c2d8874e433ba37a9b81934a44acc95f7cc0f.zip | |
* jka-compr.el (jka-compr-verbose): New variable, and use throughout.
Fixes: debbugs:8971
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/jka-compr.el | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d2bfdb90a40..9518dad5ad6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * jka-compr.el (jka-compr-verbose): New variable, and use | ||
| 4 | throughout (bug#8971). | ||
| 5 | |||
| 3 | * info.el (Info-find-file): Fall back on the installation | 6 | * info.el (Info-find-file): Fall back on the installation |
| 4 | directory if we can't find the info node anywhere else. | 7 | directory if we can't find the info node anywhere else. |
| 5 | 8 | ||
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el index 37c9d40ec65..1893e982bbb 100644 --- a/lisp/jka-compr.el +++ b/lisp/jka-compr.el | |||
| @@ -97,6 +97,11 @@ NOTE: Not used in MS-DOS and Windows systems." | |||
| 97 | :type 'string | 97 | :type 'string |
| 98 | :group 'jka-compr) | 98 | :group 'jka-compr) |
| 99 | 99 | ||
| 100 | (defcustom jka-compr-verbose t | ||
| 101 | "If non-nil, output messages whenever compressing or uncompressing files." | ||
| 102 | :type 'boolean | ||
| 103 | :group 'jka-compr) | ||
| 104 | |||
| 100 | (defvar jka-compr-use-shell | 105 | (defvar jka-compr-use-shell |
| 101 | (not (memq system-type '(ms-dos windows-nt)))) | 106 | (not (memq system-type '(ms-dos windows-nt)))) |
| 102 | 107 | ||
| @@ -309,6 +314,7 @@ There should be no more than seven characters after the final `/'." | |||
| 309 | 314 | ||
| 310 | (and | 315 | (and |
| 311 | compress-message | 316 | compress-message |
| 317 | jka-compr-verbose | ||
| 312 | (message "%s %s..." compress-message base-name)) | 318 | (message "%s %s..." compress-message base-name)) |
| 313 | 319 | ||
| 314 | (jka-compr-run-real-handler 'write-region | 320 | (jka-compr-run-real-handler 'write-region |
| @@ -341,6 +347,7 @@ There should be no more than seven characters after the final `/'." | |||
| 341 | 347 | ||
| 342 | (and | 348 | (and |
| 343 | compress-message | 349 | compress-message |
| 350 | jka-compr-verbose | ||
| 344 | (message "%s %s...done" compress-message base-name)) | 351 | (message "%s %s...done" compress-message base-name)) |
| 345 | 352 | ||
| 346 | (cond | 353 | (cond |
| @@ -404,6 +411,7 @@ There should be no more than seven characters after the final `/'." | |||
| 404 | 411 | ||
| 405 | (and | 412 | (and |
| 406 | uncompress-message | 413 | uncompress-message |
| 414 | jka-compr-verbose | ||
| 407 | (message "%s %s..." uncompress-message base-name)) | 415 | (message "%s %s..." uncompress-message base-name)) |
| 408 | 416 | ||
| 409 | (condition-case error-code | 417 | (condition-case error-code |
| @@ -479,6 +487,7 @@ There should be no more than seven characters after the final `/'." | |||
| 479 | 487 | ||
| 480 | (and | 488 | (and |
| 481 | uncompress-message | 489 | uncompress-message |
| 490 | jka-compr-verbose | ||
| 482 | (message "%s %s...done" uncompress-message base-name)) | 491 | (message "%s %s...done" uncompress-message base-name)) |
| 483 | 492 | ||
| 484 | (and | 493 | (and |
| @@ -534,6 +543,7 @@ There should be no more than seven characters after the final `/'." | |||
| 534 | 543 | ||
| 535 | (and | 544 | (and |
| 536 | uncompress-message | 545 | uncompress-message |
| 546 | jka-compr-verbose | ||
| 537 | (message "%s %s..." uncompress-message base-name)) | 547 | (message "%s %s..." uncompress-message base-name)) |
| 538 | 548 | ||
| 539 | ;; Here we must read the output of uncompress program | 549 | ;; Here we must read the output of uncompress program |
| @@ -554,6 +564,7 @@ There should be no more than seven characters after the final `/'." | |||
| 554 | 564 | ||
| 555 | (and | 565 | (and |
| 556 | uncompress-message | 566 | uncompress-message |
| 567 | jka-compr-verbose | ||
| 557 | (message "%s %s...done" uncompress-message base-name)) | 568 | (message "%s %s...done" uncompress-message base-name)) |
| 558 | 569 | ||
| 559 | (write-region | 570 | (write-region |