1. 27 May, 2010 9 commits
    • Chong Yidong's avatar
      Change delete-by-moving-to-trash so Lisp calls explicitly request trashing. · f1a5d776
      Chong Yidong authored
      * src/fileio.c (Fdelete_file): Change meaning of optional arg to mean
      whether to trash.
      (internal_delete_file, Frename_file): Callers changed.
      (delete_by_moving_to_trash): Doc fix.
      (Fdelete_directory_internal): Don't move to trash.
      
      * src/callproc.c (delete_temp_file):
      * src/buffer.c (Fkill_buffer): Callers changed.
      
      * src/lisp.h: Update prototype.
      
      * lisp/diff.el (diff-sentinel):
      * lisp/epg.el (epg--make-temp-file, epg-decrypt-string)
      (epg-verify-string, epg-sign-string, epg-encrypt-string):
      * lisp/jka-compr.el (jka-compr-partial-uncompress)
      (jka-compr-call-process, jka-compr-write-region):
      * lisp/server.el (server-sentinel): Remove optional arg from
      delete-file, reverting 2010-05-03 change.
      
      * lisp/dired.el (dired-delete-file): New arg TRASH.
      (dired-internal-do-deletions): New arg TRASH.  Use progress
      reporter.
      (dired-do-flagged-delete, dired-do-delete): Use trash.
      
      * lisp/files.el (delete-directory): New arg TRASH.
      
      * lisp/speedbar.el (speedbar-item-delete): Allow trashing.
      
      * lisp/net/ange-ftp.el (ange-ftp-del-tmp-name, ange-ftp-delete-file)
      (ange-ftp-rename-remote-to-remote)
      (ange-ftp-rename-local-to-remote)
      (ange-ftp-rename-remote-to-local, ange-ftp-load)
      (ange-ftp-compress, ange-ftp-uncompress): Remove optional arg from
      `delete-file'.
      (ange-ftp-delete-directory): Add optional arg to `delete-file', to
      allow trashing.
      
      * lisp/net/tramp-compat.el (tramp-compat-delete-file): Rewrite to
      handle new TRASH arg of `delete-file'.
      
      * lisp/net/tramp-fish.el (tramp-fish-handle-delete-directory)
      (tramp-fish-handle-delete-file)
      (tramp-fish-handle-make-symbolic-link)
      (tramp-fish-handle-process-file): Use null TRASH arg in
      `tramp-compat-delete-file' call.
      
      * lisp/net/tramp-ftp.el (tramp-ftp-file-name-handler): Use null TRASH
      arg in `tramp-compat-delete-file' call.
      
      * lisp/net/tramp-gvfs.el (tramp-gvfs-handle-delete-file): Rename arg.
      (tramp-gvfs-handle-write-region): Use null TRASH arg in
      `tramp-compat-delete-file' call.
      
      * lisp/net/tramp-imap.el (tramp-imap-handle-delete-file): Rename arg.
      (tramp-imap-do-copy-or-rename-file): Use null TRASH arg in
      `tramp-compat-delete-file' call.
      
      * lisp/net/tramp-smb.el (tramp-smb-handle-copy-file)
      (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
      (tramp-smb-handle-write-region): Use null TRASH arg in
      tramp-compat-delete-file call.
      (tramp-smb-handle-delete-directory): Use tramp-compat-delete-file.
      (tramp-smb-handle-delete-file): Rename arg.
      
      * lisp/net/tramp.el (tramp-handle-delete-file): Change FORCE arg to TRASH.
      (tramp-handle-make-symbolic-link, tramp-handle-load)
      (tramp-do-copy-or-rename-file-via-buffer)
      (tramp-do-copy-or-rename-file-directly)
      (tramp-do-copy-or-rename-file-out-of-band)
      (tramp-handle-process-file, tramp-handle-call-process-region)
      (tramp-handle-shell-command, tramp-handle-file-local-copy)
      (tramp-handle-insert-file-contents, tramp-handle-write-region)
      (tramp-delete-temp-file-function): Use null TRASH arg in
      tramp-compat-delete-file call.
      f1a5d776
    • Chong Yidong's avatar
      Fix redisplay crash (Bug#6177). · f44a59e6
      Chong Yidong authored
      * xdisp.c (redisplay_window): After redisplay, check if point is
      still valid before setting it (Bug#6177).
      f44a59e6
    • Chong Yidong's avatar
      Let htmlfontify recognize face aliases (Bug#6279). · ecb0ab90
      Chong Yidong authored
      * progmodes/verilog-mode.el (verilog-type-font-keywords): Use
      font-lock-constant-face, not obsolete font-lock-reference-face.
      
      * htmlfontify.el (hfy-face-resolve-face): New function.
      (hfy-face-to-style): Use it (Bug#6279).
      ecb0ab90
    • Kenichi Handa's avatar
      merge trunk · 478ebb73
      Kenichi Handa authored
      478ebb73
    • Glenn Morris's avatar
      b7bd8478
    • Glenn Morris's avatar
    • Glenn Morris's avatar
      Do not preprocess src/Makefile.in. · 81ac4f35
      Glenn Morris authored
      * configure.in: Do not preprocess src/Makefile.in.
      (cpp_undefs, CPP_NEED_TRADITIONAL): Remove.
      (AC_EGREP_CPP): Test no longer needed.
      * configure: Regenerate.
      
      * config.bat: Do not preprocess src/Makefile.in.
      
      * make-dist: No more Makefile.c files.
      
      * INSTALL, src/README: Makefiles are not preprocessed.
      
      * src/Makefile.in, src/autodeps.mk, src/deps.mk, src/ns.mk:
      Convert comments to Makefile format.
      
      * lib-src/Makefile.in (distclean): No more Makefile.c.
      * src/Makefile.in (bootstrap-clean): No more Makefile.c.
      
      * admin/notes/cpp: Remove file.
      
      * admin/quick-install-emacs (AVOID): No more Makefile.c files.
      
      * etc/PROBLEMS, etc/MACHINES: Remove details of cpp problems which can
      no longer occur.
      81ac4f35
    • Stefan Monnier's avatar
      Provide hooks to use a different tokenizer in SMIE. · 11e4d8c0
      Stefan Monnier authored
      * lisp/emacs-lisp/smie.el (smie-forward-token-function)
      (smie-backward-token-function): New vars.
      (smie-backward-sexp, smie-forward-sexp)
      (smie-indent-hanging-p, smie-indent-calculate): Use them.
      (smie-default-backward-token): Rename from smie-backward-token and
      skip comments.
      (smie-default-forward-token): Rename from smie-forward-token and
      skip comments.
      (smie-next-sexp): Handle nil results from next-token.
      (smie-indent-calculate): Add a new case for special `fixindent' comments.
      11e4d8c0
    • Kenichi Handa's avatar
  2. 26 May, 2010 11 commits
  3. 25 May, 2010 20 commits