diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | doc_src/faq.hdr | 2 | ||||
| -rw-r--r-- | doc_src/fish_pager.txt | 7 | ||||
| -rw-r--r-- | fish.xcodeproj/project.pbxproj | 4 | ||||
| -rw-r--r-- | pager.cpp | 2 |
6 files changed, 3 insertions, 22 deletions
@@ -20,7 +20,6 @@ doc_src/index.hdr po/*.gmo fish fish_indent -fish_pager fish_tests fishd mimedb diff --git a/configure.ac b/configure.ac index 9eda25a6..34249566 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,6 @@ AC_SUBST(HAVE_DOXYGEN) AC_SUBST(LDFLAGS_FISH) AC_SUBST(LIBS_FISH) AC_SUBST(LIBS_FISH_INDENT) -AC_SUBST(LIBS_FISH_PAGER) AC_SUBST(LIBS_FISHD) AC_SUBST(LIBS_MIMEDB) @@ -436,14 +435,6 @@ LIBS="$LIBS_SHARED" LIBS_FISH_INDENT=$LIBS # -# Check for libraries needed by fish_pager. -# - -LIBS="$LIBS_SHARED" -AC_SEARCH_LIBS( iconv_open, iconv, , [AC_SEARCH_LIBS( libiconv_open, iconv, , [AC_MSG_ERROR([Could not find an iconv implementation, needed to build fish])] )] ) -LIBS_FISH_PAGER=$LIBS - -# # Check for libraries needed by fishd. # diff --git a/doc_src/faq.hdr b/doc_src/faq.hdr index c727dd5d..3961d1da 100644 --- a/doc_src/faq.hdr +++ b/doc_src/faq.hdr @@ -266,7 +266,7 @@ Next, do the following (assuming fish was installed to /usr/local): rm -Rf /usr/local/etc/fish /usr/local/share/fish ~/.config/fish rm /usr/local/share/man/man1/fish*.1 cd /usr/local/bin -rm -f fish mimedb fish_pager fishd fish_indent +rm -f fish mimedb fishd fish_indent </pre> */ diff --git a/doc_src/fish_pager.txt b/doc_src/fish_pager.txt deleted file mode 100644 index 9efa26b1..00000000 --- a/doc_src/fish_pager.txt +++ /dev/null @@ -1,7 +0,0 @@ -\section fish_pager fish_pager - internal command used by fish - -\subsection fish_pager-description Description - -\c fish_pager is used internally by fish. It should not be used by other -commands, as its interface is liable to change in the future. - diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index deb3a107..d51f53e3 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -948,7 +948,6 @@ "$(SRCROOT)/doc_src/fish.txt", "$(SRCROOT)/doc_src/fish_config.txt", "$(SRCROOT)/doc_src/fish_indent.txt", - "$(SRCROOT)/doc_src/fish_pager.txt", "$(SRCROOT)/doc_src/fish_prompt.txt", "$(SRCROOT)/doc_src/fish_right_prompt.txt", "$(SRCROOT)/doc_src/fish_update_completions.txt", @@ -1021,7 +1020,6 @@ "$(BUILT_PRODUCTS_DIR)/man/man1/fish.1", "$(BUILT_PRODUCTS_DIR)/man/man1/fish_config.1", "$(BUILT_PRODUCTS_DIR)/man/man1/fish_indent.1", - "$(BUILT_PRODUCTS_DIR)/man/man1/fish_pager.1", "$(BUILT_PRODUCTS_DIR)/man/man1/fish_prompt.1", "$(BUILT_PRODUCTS_DIR)/man/man1/fish_right_prompt.1", "$(BUILT_PRODUCTS_DIR)/man/man1/fish_update_completions.1", @@ -1065,7 +1063,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cd \"${SRCROOT}\" ;\n# Run build_documentation.sh\n# Do this in a subshell so that we keep going even if it calls exit\n( . \"./build_tools/build_documentation.sh\" \"./Doxyfile.help\" \"./doc_src\" \"$BUILT_PRODUCTS_DIR\" )\n\n# Copy certain files into man1, destined for share/man/man1 (instead of share/fish/man/man1)\n# These copies will fail of the documentation did not build; that's OK\n# We want to create the directory even if the documentation did not build, so that the Xcode build can still succeed\nmanpathdir=\"${BUILT_PRODUCTS_DIR}/pages_for_manpath/man1\"\necho \"Copying pages destined for manpath into $manpathdir\"\nrm -Rf \"$manpathdir\"\nmkdir -p \"$manpathdir\"\nfor manpage in fish.1 set_color.1 fish_pager.1 fishd.1 fish_indent.1; do\n manpagepath=\"${BUILT_PRODUCTS_DIR}/man/man1/${manpage}\"\n test -f \"$manpagepath\" && cp \"$manpagepath\" \"${BUILT_PRODUCTS_DIR}/pages_for_manpath/man1/\"\ndone\n\n# Always succeed\ntrue\n"; + shellScript = "cd \"${SRCROOT}\" ;\n# Run build_documentation.sh\n# Do this in a subshell so that we keep going even if it calls exit\n( . \"./build_tools/build_documentation.sh\" \"./Doxyfile.help\" \"./doc_src\" \"$BUILT_PRODUCTS_DIR\" )\n\n# Copy certain files into man1, destined for share/man/man1 (instead of share/fish/man/man1)\n# These copies will fail of the documentation did not build; that's OK\n# We want to create the directory even if the documentation did not build, so that the Xcode build can still succeed\nmanpathdir=\"${BUILT_PRODUCTS_DIR}/pages_for_manpath/man1\"\necho \"Copying pages destined for manpath into $manpathdir\"\nrm -Rf \"$manpathdir\"\nmkdir -p \"$manpathdir\"\nfor manpage in fish.1 set_color.1 fishd.1 fish_indent.1; do\n manpagepath=\"${BUILT_PRODUCTS_DIR}/man/man1/${manpage}\"\n test -f \"$manpagepath\" && cp \"$manpagepath\" \"${BUILT_PRODUCTS_DIR}/pages_for_manpath/man1/\"\ndone\n\n# Always succeed\ntrue\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -11,7 +11,7 @@ typedef pager_t::comp_t comp_t; typedef std::vector<completion_t> completion_list_t; typedef std::vector<comp_t> comp_info_list_t; -/** The minimum width (in characters) the terminal may have for fish_pager to not refuse showing the completions */ +/** The minimum width (in characters) the terminal must to show completions at all */ #define PAGER_MIN_WIDTH 16 /** The maximum number of columns of completion to attempt to fit onto the screen */ |