1. 21 Feb, 2011 13 commits
  2. 20 Feb, 2011 16 commits
  3. 19 Feb, 2011 11 commits
    • Dmitry Bolshakov's avatar
      Prevent hideshow from parsing braces inside comments (Bug#8036). · a87af185
      Dmitry Bolshakov authored
      * progmodes/hideshow.el (hs-find-block-beginning)
      (hs-hide-level-recursive): Ignore comments when parsing braces.
      a87af185
    • Chong Yidong's avatar
      Improvements to vc-bzr conffile handling and pull/merge support. · 3ab713fd
      Chong Yidong authored
      * vc/vc-bzr.el (vc-bzr--branch-conf): Function deleted.
      (vc-bzr-branch-conf): New function, similar to vc-bzr--branch-conf
      but returning an alist.  Ignore comments in bzr conffile.
      (vc-bzr-pull, vc-bzr-merge-branch): Use vc-bzr-branch-conf.
      (vc-bzr-error-regex-alist): New var.
      (vc-bzr-merge-branch): Use it to highlight the pull/merge buffer.
      
      * progmodes/compile.el (compilation--flush-directory-cache):
      Handle the case where cdr of compilation--flush-directory-cache
      points to no buffer, which can occur if we previously switched to
      compilation-mode in a pregenerated buffer.
      
      * vc/vc-dispatcher.el (vc-do-async-command): Bind
      inhibit-read-only to t.
      3ab713fd
    • Glenn Morris's avatar
      dired-x no longer requires dired-aux. · cad7445b
      Glenn Morris authored
      * lisp/dired-x.el: Don't require dired-aux.
      (dired-do-create-files, dired-mark-read-regexp)
      (dired-do-create-files-regexp): Autoload from dired-aux.
      cad7445b
    • Glenn Morris's avatar
      Merge dired-x's dired-find-buffer-nocreate into dired.el. · bea584fa
      Glenn Morris authored
      * lisp/dired-x.el (dired-find-buffer-nocreate): Merge into dired.el.
      
      * lisp/dired.el (dired-find-buffer-nocreate): Merge dired-x version.
      
      * doc/misc/dired-x.texi (Technical Details):
      No longer redefines dired-find-buffer-nocreate.
      bea584fa
    • Eli Zaretskii's avatar
      Adapt and fix the MS-DOS port due to gnulib imports. · 615d868e
      Eli Zaretskii authored
       msdos/depfiles.bat: New file.
       msdos/sedlibmk.inp: New file.
       msdos/sedlibcf.inp: New file.
       msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
       (BUILT_EMACS): Rename from BUILT-EMACS.
       msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
       (ENVADD): Adjust to MAKEINFO_OPTS.
       (texinputdir): Don't edit.
       msdos/sed3v2.inp (-DVERSION): Edit out.
       (LOADLIBES): Don't edit to empty.
       msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
       BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
       (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
       (HAVE__BOOL): Edit to 1.
       (VERSION, inline, restrict): Edit for DJGPP.
       (my_strftime): Edit to nstrftime.
       msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
       (@true): Edit to "@rem".
       (move-if-change): Edit to "update".
       (echo): Edit to "djecho".
       (cd $(lib) && ...): Edit to "$(MAKE) -C ...".
       (LIBOBJS): Edit to empty.
       ($(libsrc)/make-docfile): Two new edits, one each for every
       invocation of make-docfile.
       (move-if-change): Fix edit.
       Remove some unused switches from $(ALL_CFLAGS), to make the GCC
       command line shorter.
       msdos/mainmake.v2 (version): Remove, no longer needed (config.in
       defines VERSION).
       (all): Add lib.
       (lib): New target and recipe.
       (lib-src): Depend on lib.
       (src): Depend on lib and lib-src.
       (clean, mostlyclean, distclean, maintainer-clean, extraclean)
       (bootstrap-clean): Recurse into lib.
       (lib, lib-src, src): Specify "all" as an explicit target.
       .bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
       Add lib/deps/.
       config.bat: Configure in `lib'.
       Generate *.Po files in lib/deps.
       src/termcap.c (tputs): Don't declare baud_rate.
       src/s/msdos.h (strtold): Define to _strtold.
      615d868e
    • Eli Zaretskii's avatar
      Fix MS-DOS build in src/: delete gl-tmp. · 83627c03
      Eli Zaretskii authored
       msdos/sed1v2.inp: Delete gl-tmp after updating globals.h
      83627c03
    • Eli Zaretskii's avatar
      Finish fixing the MS-DOS build. Everything builds and works. · f601db19
      Eli Zaretskii authored
       src/termcap.c (tputs): Don't declare baud_rate.
       msdos/sedlibmk.inp (gl_LIBOBJS): Add getloadavg.o.
       msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
       (BUILT_EMACS): Rename from BUILT-EMACS.
       msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
       (ENVADD): Adjust to MAKEINFO_OPTS.
       (texinputdir): Don't edit.
       msdos/sed2v2.inp (my_strftime): Edit to nstrftime.
       msdos/sed1v2.inp (LIBOBJS): Edit to empty.
       ($(libsrc)/make-docfile): Two new edits, one each for every
       invocation of make-docfile.
       (move-if-change): Fix edit.
       Remove some unused switches from $(ALL_CFLAGS), to make the GCC
       command line shorter.
      f601db19
    • Glenn Morris's avatar
    • Chong Yidong's avatar
      Fix typo in auth.texi (Bug#8068). · 27ac6e79
      Chong Yidong authored
      27ac6e79
    • Glenn Morris's avatar
      Merge dired-x's dired-read-shell-command into dired-aux's version. · d6e96966
      Glenn Morris authored
      * lisp/dired-x.el (dired-read-shell-command): Merge into dired-aux's version.
      
      * lisp/dired-aux.el (dired-read-shell-command): Merge dired-x's version.
      
      * doc/misc/dired-x.texi (Technical Details):
      No longer redefines dired-read-shell-command.
      d6e96966
    • Glenn Morris's avatar
      Merge dired-x's dired-clean-up-after-deletion into dired's version. · 42924231
      Glenn Morris authored
      * lisp/dired-x.el (dired-clean-up-after-deletion): Merge into dired.el.
      
      * lisp/dired.el (dired-clean-up-after-deletion): Merge dired-x's version.
      (dired-clean-up-buffers-too): Declare.
      
      * doc/misc/dired-x.texi (Technical Details):
      No longer redefine dired-clean-up-after-deletion.
      42924231